summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 15:23:08 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 15:23:08 +0000
commit794fe2ca45750a56d7deb6ede7fd97bd69fea27e (patch)
treed1bc7172c815ff7cfb143184971c033be846f02a /contrib
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentMerge pull request #58 from matrix-org/get_event_counters (diff)
downloadsynapse-794fe2ca45750a56d7deb6ede7fd97bd69fea27e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions