David Baker ed72fc3a50 Merge branch 'develop' into pushrules2 ...

Conflicts:
	synapse/storage/schema/pusher.sql

2015-03-04 15:24:21 +00:00

..

delta

Merge branch 'develop' into pushrules2

2015-03-04 15:24:21 +00:00

full_schemas/11

Actually add full_schemas dir

2015-03-04 13:34:38 +00:00

schema_version.sql

s/schema_deltas/applied_schema_deltas/

2015-03-04 15:06:22 +00:00