Richard van der Hoff 6a1ae7b3bd Merge branch 'develop' into matthew/encrypt-for-invited-users		2019-05-15 17:14:38 +01:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
3484.feature	changelog	2018-07-05 01:53:53 +02:00
5043.feature	Add ability to blacklist ip ranges for federation traffic (#5043)	2019-05-13 19:05:06 +01:00
5171.misc	Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171)	2019-05-13 15:01:14 -05:00
5183.misc	Newsfile	2019-05-14 13:12:23 +01:00
5184.misc	Newsfile	2019-05-14 13:41:36 +01:00
5185.misc	Newsfile	2019-05-14 14:39:27 +01:00