diff options
author | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-10-23 11:11:56 +0100 |
commit | 259d10f0e4947f58e70998971b5d862a5ebe17d4 (patch) | |
tree | 89ecd1b19ed7668d502418e7fbf1310ed68afaba /synapse/config/__main__.py | |
parent | Merge pull request #325 from matrix-org/markjh/filter_dicts (diff) | |
parent | Fix receipts for room initial sync (diff) | |
download | synapse-259d10f0e4947f58e70998971b5d862a5ebe17d4.tar.xz |
Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/__main__.py')
0 files changed, 0 insertions, 0 deletions