diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
| commit | d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a (patch) | |
| tree | 4458974456c631386c7acd699b15a9f51779f0b2 /synapse/appservice | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable (diff) | |
| parent | Merge pull request #283 from matrix-org/erikj/atomic_join_federation (diff) | |
| download | synapse-d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions