268 commits

Author	SHA1	Message	Date
Erik Johnston	9b8c0fb162	Merge branch 'master' of github.com:matrix-org/synapse into develop	2018-03-26 21:41:55 +01:00
Erik Johnston	a9d7d98d3f	Bum version and changelog	2018-03-26 16:36:53 +01:00
Erik Johnston	01f72e2fc7	Fix date	2018-03-26 16:21:26 +01:00
Erik Johnston	9187862002	Bump version and changelog	2018-03-26 16:20:24 +01:00
Neil Johnson	51406dab96	version bump	2018-03-26 14:48:19 +01:00
Matthew Hodgson	8efe773ef1	fix typo	2018-03-23 21:38:42 +00:00
Neil Johnson	f5aa027c2f	Update CHANGES.rst ... rearrange ordering of releases to match chronology	2018-03-20 15:06:22 +00:00
Neil Johnson	e66fbcbb02	fix merge conflicts	2018-03-20 14:25:31 +00:00
Neil Johnson	1a3aa957ca	Update CHANGES.rst	2018-03-19 15:11:00 +00:00
Erik Johnston	0092cf38ae	Newline	2018-03-16 00:11:58 +00:00
Erik Johnston	ba48755d56	Bump version and changelog	2018-03-15 23:57:26 +00:00
Richard van der Hoff	068c21ab10	CHANGES.rst: reword metric deprecation	2018-03-15 10:36:31 +00:00
Neil Johnson	b29d1abab6	Update CHANGES.rst	2018-03-15 10:34:15 +00:00
Neil Johnson	7367a4a823	Update CHANGES.rst	2018-03-15 10:33:52 +00:00
Neil Johnson	7d26591048	Update CHANGES.rst	2018-03-15 10:33:24 +00:00
Erik Johnston	2059b8573f	Update CHANGES.rst	2018-03-14 18:11:21 +00:00
Erik Johnston	10fdcf561d	Fix up rst formatting	2018-03-14 17:30:17 +00:00
Neil Johnson	5ccb57d3ff	Update CHANGES.rst	2018-03-14 17:12:58 +00:00
Neil Johnson	fb647164f2	Update CHANGES.rst	2018-03-14 16:20:36 +00:00
Neil Johnson	a492b17fe2	Update CHANGES.rst ... clean formatting	2018-03-14 16:18:09 +00:00
Neil Johnson	cb2c7c0669	Update CHANGES.rst ... WIP, need to add most recent PRs	2018-03-14 16:09:20 +00:00
Richard van der Hoff	ee7a1cabd8	document metrics changes	2018-01-16 13:04:01 +00:00
Erik Johnston	7cd34512d8	When using synctl with workers, don't start the main synapse automatically	2018-01-11 11:37:39 +00:00
Erik Johnston	864a6d2977	Bump version and changelog	2018-01-05 10:54:01 +00:00
Erik Johnston	80573e3900	Fix rc version number	2017-12-13 15:15:33 +00:00
Erik Johnston	069ae2a5d6	Bump changelog and version	2017-12-13 15:11:22 +00:00
Richard van der Hoff	2187724ad2	Prep changelog for v0.25.1	2017-11-17 10:09:16 +00:00
Erik Johnston	5d0cbf763f	Bump changelog	2017-11-15 11:29:32 +00:00
Erik Johnston	03feb7a34d	Bump version and changelog	2017-11-14 14:51:25 +00:00
Erik Johnston	6ba4fabdb9	Bump version and changelog	2017-10-24 14:15:27 +01:00
Erik Johnston	13e16cf302	Bump version and changelog	2017-10-23 13:13:31 +01:00
Erik Johnston	d6237859f6	Update changelog	2017-10-19 14:19:52 +01:00
Erik Johnston	0ef0aeceac	Bump version and changelog	2017-10-19 13:48:33 +01:00
Erik Johnston	6c1bb1601e	Bump version and changelog	2017-10-02 18:05:17 +01:00
Erik Johnston	e4a709eda3	Bump version and change log	2017-10-02 13:51:38 +01:00
Erik Johnston	f4c8cd5e85	Bump changelog and version	2017-09-26 10:02:48 +01:00
Erik Johnston	b15c2b7971	Update CHANGES	2017-09-25 11:34:12 +01:00
Erik Johnston	ba8fdc925c	Bump version and changes	2017-09-25 11:01:31 +01:00
Erik Johnston	76ed3476d3	Bump version and changelog	2017-07-06 18:11:22 +01:00
Erik Johnston	6264cf9666	Bump version and changelog	2017-07-06 10:35:56 +01:00
Erik Johnston	05538587ef	Bump version and changelog	2017-07-04 14:02:21 +01:00
Erik Johnston	976128f368	Update version and changelog	2017-06-26 16:14:56 +01:00
Erik Johnston	fdf1ca30f0	Bump version and changelog	2017-06-15 12:59:06 +01:00
Erik Johnston	a5425b2e5b	Bump changelog and version	2017-05-18 13:53:48 +01:00
Erik Johnston	7c53a27801	Update changelog	2017-05-17 13:13:45 +01:00
Erik Johnston	c6f4ff1475	Spelling	2017-05-17 11:29:14 +01:00
Erik Johnston	3a431a126d	Bump changelog and version	2017-05-17 11:26:57 +01:00
Erik Johnston	771c8a83c7	Bump version and changelog	2017-05-08 13:23:46 +01:00
Erik Johnston	9ac98197bb	Bump version and changelog	2017-05-08 11:07:54 +01:00
Erik Johnston	d563b8d944	Bump changelog	2017-04-11 11:12:13 +01:00