Amber Brown a1b8767da8 Merge remote-tracking branch 'origin/develop' into shhs		2019-05-13 15:01:58 -05:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
5043.feature	Add ability to blacklist ip ranges for federation traffic (#5043)	2019-05-13 19:05:06 +01:00
5099.misc	Remove Python 2 from the SHHS branch CI (#5099)	2019-04-26 01:40:01 +10: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