diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-19 17:15:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-19 17:15:24 +0100 |
| commit | ddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f (patch) | |
| tree | 2b65d76c5b264d4a4cbcf7a3c5e08d260baad9e4 /res | |
| parent | Update changelog (diff) | |
| parent | Merge pull request #1131 from matrix-org/matthew/e2e-notifs (diff) | |
| download | synapse-ddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions