summary refs log tree commit diff
path: root/scripts-dev/definitions.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-24 13:59:35 +0000
committerErik Johnston <erik@matrix.org>2017-03-24 13:59:35 +0000
commit822412150294bb73768b7b031e8c2b651553f4be (patch)
tree2fa50098796fc0b867d14138e758006826c56e48 /scripts-dev/definitions.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2062 from matrix-org/erikj/presence_replication (diff)
downloadsynapse-822412150294bb73768b7b031e8c2b651553f4be.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'scripts-dev/definitions.py')
0 files changed, 0 insertions, 0 deletions