diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-02 16:50:28 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-02 16:50:28 +0000 |
commit | f8c407a13b04f906dc761bcf33992e05af219098 (patch) | |
tree | 0479c242f3d7df94437755296616e657a0a15858 /synapse/config | |
parent | Update changelog (diff) | |
parent | Merge pull request #1877 from matrix-org/erikj/device_list_fixes (diff) | |
download | synapse-f8c407a13b04f906dc761bcf33992e05af219098.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions