diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-15 17:33:23 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-15 17:33:23 +0000 |
commit | 9c49054f1d16d1026ba31d5af12d75bfb45a9e10 (patch) | |
tree | 052204afa629523aa61f095ac643fbeec51304eb /synapse/config | |
parent | Use frozenutils (diff) | |
parent | Update media_repository.py (diff) | |
download | synapse-9c49054f1d16d1026ba31d5af12d75bfb45a9e10.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/config')
0 files changed, 0 insertions, 0 deletions