4 Commits (431e485914b01eb1b245e37df814ff5bac110be1)

Author	SHA1	Message	Date
Erik Johnston	431e485914	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert	2019-01-25 14:11:17 +00:00
Andrew Morgan	0b3fd1401f	Don't require sqlite3 when using postgres (#4466)	2019-01-25 22:25:02 +11:00
Erik Johnston	1953067136	Disable native upserts for sqlite, as they don't work	2019-01-25 10:46:49 +00:00
Amber Brown	58f6c48183	Use native UPSERTs where possible (#4306)	2019-01-24 21:31:54 +11:00