summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-15 17:33:23 +0000
committerErik Johnston <erik@matrix.org>2014-12-15 17:33:23 +0000
commit9c49054f1d16d1026ba31d5af12d75bfb45a9e10 (patch)
tree052204afa629523aa61f095ac643fbeec51304eb /synapse/config
parentUse frozenutils (diff)
parentUpdate media_repository.py (diff)
downloadsynapse-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