Amber Brown 984376745b Merge branch 'master' into develop		2018-08-09 19:23:47 +10:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
3632.misc	Fixup wording and remove dead code	2018-08-09 09:56:10 +01:00
3633.feature	Add ability to limit number of monthly active users on the server	2018-08-03 14:05:20 +01:00
3647.misc	Test fixes for Python 3 (#3647)	2018-08-09 12:22:01 +10:00
3654.feature	changelog	2018-08-06 16:30:52 +01:00
3658.bugfix	changelog	2018-08-07 10:02:01 +01:00
3662.feature	Ability to whitelist specific threepids against monthly active user limiting	2018-08-08 12:06:42 +01:00
3664.feature	changelog	2018-08-07 22:14:35 +01:00