summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:14:27 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:14:27 +0000
commitf7b84eb92a2208715ac0b0787f2a70ee540082d7 (patch)
treef84a3b1845ff2e6df699d69f3fbb99a2c1ed918b /synapse/events
parentMerge branch 'develop' of github.com:matrix-org/synapse into rejections_storage (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu... (diff)
downloadsynapse-f7b84eb92a2208715ac0b0787f2a70ee540082d7.tar.xz
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections_storage
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions