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

Conflicts:
	synapse/storage/schema/pusher.sql

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

..

11

SYN-67: Finish up implementing new database schema management

2015-03-04 12:04:19 +00:00

12

SYN-67: Finish up implementing new database schema management

2015-03-04 12:04:19 +00:00

13

SYN-67: Finish up implementing new database schema management

2015-03-04 12:04:19 +00:00

14

Change to use logger in db upgrade script

2015-03-04 13:43:35 +00:00

next_pushrules2.sql

Add enable/disable overlay for push rules (REST API not yet hooked up)

2015-02-25 19:17:07 +00:00