summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 13:34:25 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 13:34:25 +0000
commit6375abcdacf4ae95b8671917fc94461a2fbf884c (patch)
treea927bb6c99b99d1a23a9e6df7fb2cd21316e79c1 /synapse/state.py
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentBump version (diff)
downloadsynapse-6375abcdacf4ae95b8671917fc94461a2fbf884c.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions