diff options
author | Erik Johnston <erik@matrix.org> | 2016-11-01 11:57:28 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-11-01 11:57:28 +0000 |
commit | f6e8019b9c8e94450327e10cffafe95882a656f3 (patch) | |
tree | 820a9c2b0f78a6460478786753bb7eb4b55726bb /synapse/__init__.py | |
parent | Changelog formattting (diff) | |
parent | Merge pull request #1187 from matrix-org/paul/metrics-howto (diff) | |
download | synapse-f6e8019b9c8e94450327e10cffafe95882a656f3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions