mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-09-17 06:44:36 -04:00
Merge branch 'develop' into request_logging
Conflicts: synapse/config/logger.py
This commit is contained in:
commit
7c06399512
46 changed files with 391 additions and 199 deletions
|
@ -12,4 +12,3 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue