5 Commits (d1e56cfcd11bcd509d8fa3954c00e06a84bddd87)

Author	SHA1	Message	Date
Erik Johnston	fa72803490	Merge branch 'master' of github.com:matrix-org/synapse into develop	2018-03-19 11:41:01 +00:00
Erik Johnston	926ba76e23	Replace ujson with simplejson	2018-03-15 23:43:31 +00:00
Erik Johnston	8aab9d87fa	Don't require config to create database	2016-04-06 14:15:45 +01:00
Matthew Hodgson	6c28ac260c	copyrights	2016-01-07 04:26:29 +00:00
Mark Haines	d57c5cda71	Bump schema version. ... As we released version 26 in v0.11.1	2015-12-04 15:28:39 +00:00