summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-15 11:30:41 +0000
committerErik Johnston <erik@matrix.org>2017-03-15 11:30:41 +0000
commit224dc4f6a9a80444eebddd223541a85b9deee263 (patch)
tree4f44aa95b28eadf58cc5daa8622a97add5df54b3 /scripts-dev
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2008 from matrix-org/erikj/notifier_stats (diff)
downloadsynapse-224dc4f6a9a80444eebddd223541a85b9deee263.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'scripts-dev')
0 files changed, 0 insertions, 0 deletions