Erik Johnston fdd2ac495a Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage ... Conflicts: synapse/storage/__init__.py		2015-01-30 14:57:33 +00:00
..
v2.sql	…
v3.sql	…
v4.sql	…
v5.sql	…
v6.sql	…
v8.sql	…
v9.sql	…
v11.sql	…
v12.sql	Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage	2015-01-30 14:08:28 +00:00
v13.sql	Move bump schema delta	2015-01-29 14:53:18 +00:00