Brendan Abolivier c2b4621630 Merge branch 'develop' into babolivier/mark_unread		2020-06-15 16:37:08 +01:00
..
.gitignore
7606.bugfix	Remove "user_id" from GET /presence. (#7606)	2020-06-11 14:13:53 -04:00
7639.feature	Add option to enable encryption by default for new rooms (#7639)	2020-06-10 17:44:34 +01:00
7652.doc	fix typo in sample_config.yaml (#7652)	2020-06-11 11:51:10 +01:00
7657.misc	Clean-up the fallback login code. (#7657)	2020-06-10 09:50:39 -04:00
7663.bugfix	Take out a lock before modifying _CACHES (#7663)	2020-06-10 18:27:49 +01:00
7664.misc	Increase the default SAML session expirary time to 15 minutes. (#7664)	2020-06-11 07:55:45 -04:00
7673.feature	Incorporate review bits	2020-06-12 15:13:12 +01:00