summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-26 17:30:00 +0000
committerErik Johnston <erik@matrix.org>2016-01-26 17:30:00 +0000
commite4e33c743ef1981734c5876206913ad1f839d72f (patch)
tree5f38327142abb0091adf86364b83407a98a71067 /demo
parentRemove redundated BaseHomeServer (diff)
parentMerge pull request #529 from matrix-org/dbkr/one_to_one_only_messages (diff)
downloadsynapse-e4e33c743ef1981734c5876206913ad1f839d72f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_refactor
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions