Richard van der Hoff 7fe407a87a Merge branch 'master' into develop		2019-02-06 09:50:54 +00:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
3902.feature	by default include m.room.encryption on invites (#3902)	2019-01-30 16:26:13 +00:00
4462.misc	Filter user directory state query to a subset of state events (#4462)	2019-02-05 12:16:28 +00:00
4513.misc	Reject large transactions on federation (#4513)	2019-01-31 11:44:04 +00:00
4530.bugfix	Add changelog	2019-01-30 19:04:48 +00:00
4546.bugfix	Fix noisy "twisted.internet.task.TaskStopped" errors in logs	2019-02-01 12:22:57 +00:00
4576.misc	Fix docker upload job to push -py2 images (#4576)	2019-02-06 09:41:54 +00:00