summary refs log tree commit diff
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-03-04 15:24:21 +0000
committerDavid Baker <dave@matrix.org>2015-03-04 15:24:21 +0000
commited72fc3a503d292f6ca6b1b6e636278c8e2565e4 (patch)
treef10f4575f423735c290c220b078db746ec151608 /MANIFEST.in
parentMerge branch 'develop' into pushrules2 (diff)
parentMerge pull request #99 from matrix-org/schema_versioning (diff)
downloadsynapse-ed72fc3a503d292f6ca6b1b6e636278c8e2565e4.tar.xz
Merge branch 'develop' into pushrules2
Conflicts:
	synapse/storage/schema/pusher.sql
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions