summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-21 18:21:56 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-21 18:21:56 +0100
commit8798f2291c4506bf2cb3304aba70694a2e3175d0 (patch)
tree8db5e9751ba677205f22642d45e2b9d7c2d0c968 /synapse/__init__.py
parentMerge branch 'master' into develop (diff)
parentMerge branch 'release-v1.32.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-8798f2291c4506bf2cb3304aba70694a2e3175d0.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions