Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ...

Conflicts:
	synapse/config/homeserver.py

2015-04-29 13:15:14 +01:00

..

appservice_txns.sql

Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except for a limit

2015-04-28 12:41:33 +01:00

presence_indices.sql

Add index to presence table

2015-04-07 12:09:36 +01:00

server_keys.sql

Add server_keys.sql to the current delta rather than creating a new delta

2015-04-28 10:50:00 +01:00

v15.sql

Allow multiple pushers for a single app ID & pushkey, honouring the 'append' flag in the API.

2015-03-25 19:06:22 +00:00