David Baker b56730bb6e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py

2014-12-18 15:15:22 +00:00

..

v2.sql

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

v3.sql

Generate m.room.aliases event when the HS creates a room alias

2014-09-05 21:35:56 +01:00

v4.sql

Rename deletions to redactions

2014-09-24 15:27:59 +01:00

v5.sql

SYN-48: Implement WHOIS rest servlet

2014-09-29 14:59:52 +01:00

v6.sql

Bump database version number.

2014-10-17 20:26:18 +01:00

v8.sql

Add update delta for schema change

2014-11-26 11:17:19 +00:00

v9.sql

schema version is now 10

2014-12-18 15:11:06 +00:00

v10.sql

schema version is now 10

2014-12-18 15:11:06 +00:00