diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-13 13:50:57 +0100 |
| commit | 5989637f37b127f2a0c55ef0b1085ebd0d2928c1 (patch) | |
| tree | 0480f8a77111f35aede6622e7ff0ed8329b6a6dd /synapse/__init__.py | |
| parent | Comments (diff) | |
| parent | Merge pull request #196 from matrix-org/erikj/room_history (diff) | |
| download | synapse-5989637f37b127f2a0c55ef0b1085ebd0d2928c1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions