Neil Johnson 69c49d3fa3 Merge branch 'develop' into neilj/limit_exceeded_error		2018-08-17 12:44:26 +00:00
..
.gitignore
1491.feature
3184.feature	Add GET media/v1/config (#3184)	2018-08-16 14:23:38 +01:00
3423.misc
3568.feature
3574.feature	initial cut at a room summary API (#3574)	2018-08-16 09:46:50 +01:00
3589.feature	lazyload aware /messages (#3589)	2018-08-16 14:22:47 +01:00
3632.misc
3633.feature
3647.misc
3653.feature
3654.feature
3655.feature
3658.bugfix
3660.misc
3661.bugfix
3662.feature
3664.feature
3669.misc
3670.feature
3676.bugfix
3677.bugfix
3678.misc
3679.misc
3681.bugfix
3684.misc
3687.feature
3689.bugfix	Fix mau blocking calulation bug on login	2018-08-15 17:03:30 +01:00
3690.misc
3692.bugfix
3705.bugfix	Newsfile	2018-08-16 15:41:48 +01:00
3707.misc	add new error type ResourceLimit	2018-08-16 21:04:30 +01:00
3708.feature	For resource limit blocked users, prevent writing into rooms	2018-08-16 23:05:20 +01:00
3712.misc	Create 3712.misc	2018-08-17 02:47:31 -06:00