diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-09 14:53:30 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-09 14:53:30 +0000 |
commit | d45c030652d879ef0b967bfe1dd85627ac22eb79 (patch) | |
tree | 47cd5652d60fc765824bc75afa74b232bbcdaee1 /synapse/server.py | |
parent | PEP8 (diff) | |
parent | Ignore pycharm dir (diff) | |
download | synapse-d45c030652d879ef0b967bfe1dd85627ac22eb79.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions