Erik Johnston 6e11803ed3 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks		2018-05-23 10:54:14 +01:00
..
11	…
12	…
13	…
14	Use simplejson throughout	2018-03-29 22:45:52 +01:00
15	…
16	…
17	…
18	…
19	…
20	…
21	…
22	…
23	…
24	…
25	Replace ujson with simplejson	2018-03-15 23:43:31 +00:00
26	…
27	Merge branch 'master' of github.com:matrix-org/synapse into develop	2018-03-19 11:41:01 +00:00
28	…
29	…
30	Move more xrange to six	2018-04-28 13:57:00 +02:00
31	Replace ujson with simplejson	2018-03-15 23:43:31 +00:00
32	…
33	Replace ujson with simplejson	2018-03-15 23:43:31 +00:00
34	…
35	…
36	…
37	…
38	move search reindex to schema 47	2018-02-13 16:44:46 +00:00
39	…
40	…
41	…
42	…
43	…
44	…
45	…
46	move search reindex to schema 47	2018-02-13 16:44:46 +00:00
47	Comments	2018-02-16 11:35:01 +00:00
48	Merge pull request #3213 from matrix-org/rav/consent_handler	2018-05-16 07:19:18 +01:00
49	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks	2018-05-23 10:54:14 +01:00