summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-12 14:28:43 +0100
committerErik Johnston <erik@matrix.org>2015-08-12 14:28:43 +0100
commitd46208c12cab2971935552a5ceffb8e908b4b03b (patch)
tree276f70aa8349c40a25a32d8df6f71f3bdbe812c3 /synapse/state.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff)
parentMerge pull request #220 from matrix-org/markjh/generate_keys (diff)
downloadsynapse-d46208c12cab2971935552a5ceffb8e908b4b03b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions