diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-18 16:22:14 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-18 16:22:14 +0100 |
commit | e0f060d89b9ed82284e3781640fb77257d116753 (patch) | |
tree | 93010a33c66d1213c1a6285919cb9eca3f81a8e0 /setup.cfg | |
parent | fix wordwrap (diff) | |
parent | Bump Changelog and version (diff) | |
download | synapse-e0f060d89b9ed82284e3781640fb77257d116753.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions