diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-02 15:26:11 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-02 15:26:11 +0100 |
| commit | 464e1fcfa5fbbc51d8b1502df5971cfd2189fd37 (patch) | |
| tree | f2cf21ddaa6383c7819194cad1df2b5e2d2007be /synapse/federation | |
| parent | BF: Prevent controllers from being instantiated twice. (diff) | |
| parent | v0.1.2 (diff) | |
| download | synapse-464e1fcfa5fbbc51d8b1502df5971cfd2189fd37.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0
Conflicts: synapse/notifier.py webclient/room/room-controller.js webclient/room/room.html
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions