Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit a2ae63e

Browse files
committed
Merge branch 'develop' into rei/complement_workers_in_ci
2 parents a974ccb + 49f0686 commit a2ae63e

File tree

204 files changed

+1386
-4666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1386
-4666
lines changed

.git-blame-ignore-revs

+3
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ aff1eb7c671b0a3813407321d2702ec46c71fa56
66

77
# Update black to 20.8b1 (#9381).
88
0a00b7ff14890987f09112a2ae696c61001e6cf1
9+
10+
# Convert tests/rest/admin/test_room.py to unix file endings (#7953).
11+
c4268e3da64f1abb5b31deaeb5769adb6510c0a7

CHANGES.md

+112

changelog.d/10533.misc

-1
This file was deleted.

changelog.d/12477.misc

-1
This file was deleted.

changelog.d/12498.misc

-1
This file was deleted.

changelog.d/12513.feature

-1
This file was deleted.

changelog.d/12553.removal

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove support for the non-standard groups/communities feature from Synapse.

changelog.d/12558.removal

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove support for the non-standard groups/communities feature from Synapse.

changelog.d/12567.misc

-1
This file was deleted.

changelog.d/12586.misc

-1
This file was deleted.

changelog.d/12588.misc

-1
This file was deleted.

changelog.d/12618.feature

-1
This file was deleted.

changelog.d/12623.feature

-1
This file was deleted.

changelog.d/12630.misc

-1
This file was deleted.

changelog.d/12672.misc

-1
This file was deleted.

changelog.d/12673.feature

-1
This file was deleted.

changelog.d/12676.misc

-1
This file was deleted.

changelog.d/12677.misc

-1
This file was deleted.

changelog.d/12679.misc

-1
This file was deleted.

changelog.d/12680.misc

-1
This file was deleted.

changelog.d/12683.bugfix

-1
This file was deleted.

changelog.d/12687.bugfix

-1
This file was deleted.

changelog.d/12689.misc

-1
This file was deleted.

changelog.d/12691.misc

-1
This file was deleted.

changelog.d/12693.misc

-1
This file was deleted.

changelog.d/12694.misc

-1
This file was deleted.

changelog.d/12695.misc

-1
This file was deleted.

changelog.d/12696.bugfix

-1
This file was deleted.

changelog.d/12698.misc

-1
This file was deleted.

changelog.d/12699.misc

-1
This file was deleted.

changelog.d/12700.misc

-1
This file was deleted.

changelog.d/12701.feature

-1
This file was deleted.

changelog.d/12705.misc

-1
This file was deleted.

changelog.d/12708.misc

-1
This file was deleted.

changelog.d/12709.removal

-1
This file was deleted.

changelog.d/12711.misc

-1
This file was deleted.

changelog.d/12713.bugfix

-1
This file was deleted.

changelog.d/12715.doc

-1
This file was deleted.

changelog.d/12716.misc

-1
This file was deleted.

changelog.d/12717.misc

-1
This file was deleted.

changelog.d/12720.misc

-1
This file was deleted.

changelog.d/12721.bugfix

-1
This file was deleted.

changelog.d/12723.misc

-1
This file was deleted.

changelog.d/12726.misc

-1
This file was deleted.

changelog.d/12727.doc

-1
This file was deleted.

changelog.d/12731.misc

-1
This file was deleted.

changelog.d/12734.misc

-1
This file was deleted.

changelog.d/12740.feature

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Experimental support for [MSC3772](https://github.com/matrix-org/matrix-spec-proposals/pull/3772): Push rule for mutually related events.

changelog.d/12742.doc

-1
This file was deleted.

changelog.d/12746.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Always send an `access_token` in `/thirdparty/` requests to appservices, as required by the [Matrix specification](https://spec.matrix.org/v1.1/application-service-api/#third-party-networks).

changelog.d/12747.bugfix

-1
This file was deleted.

changelog.d/12748.doc

-1
This file was deleted.

changelog.d/12749.doc

-1
This file was deleted.

changelog.d/12753.misc

-1
This file was deleted.

changelog.d/12759.doc

-1
This file was deleted.

changelog.d/12761.doc

-1
This file was deleted.

changelog.d/12762.misc

-1
This file was deleted.

changelog.d/12765.doc

-1
This file was deleted.

changelog.d/12769.misc

-1
This file was deleted.

changelog.d/12770.bugfix

-1
This file was deleted.

0 commit comments

Comments
 (0)