summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
committerErik Johnston <erik@matrix.org>2018-10-26 09:52:23 +0100
commit9f2d14ee267348ee0c62565ec51b4263feab26c2 (patch)
tree6fb9f28a419a1c45589802fd83ea1983dd6dee04 /synapse/api/constants.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4089 from dekonnection/master (diff)
downloadsynapse-9f2d14ee267348ee0c62565ec51b4263feab26c2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/constants.py')
0 files changed, 0 insertions, 0 deletions