summary refs log tree commit diff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 11:10:37 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 11:10:37 +0000
commit2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch)
tree23710ca7b15e7d65eee8885a04b23a829ca00379 /MANIFEST.in
parentUpdate the current state of an event if we update auth events. (diff)
parentInclude content in notification pokes (diff)
downloadsynapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions