Erik Johnston 4c38c71966 Merge remote-tracking branch 'origin/develop' into erikj/make_room_admin		2020-11-17 13:43:46 +00:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
8617.feature	Add admin API for logging in as a user (#8617)	2020-11-17 10:51:25 +00:00
8734.doc	Clarify the usecase for an msisdn delegate (#8734)	2020-11-14 23:09:36 +00:00
8751.misc	Generalise _locally_reject_invite (#8751)	2020-11-16 15:37:36 +00:00
8754.misc	Generalise _maybe_store_room_on_invite (#8754)	2020-11-13 16:24:04 +00:00
8756.feature	Update changelog.d/8756.feature	2020-11-17 10:19:41 +00:00
8757.misc	changelog	2020-11-15 23:09:03 +00:00
8758.misc	Move `wait_until_result` into `FakeChannel` (#8758)	2020-11-16 18:21:47 +00:00
8759.misc	Rename `create_test_json_resource` to `create_test_resource` (#8759)	2020-11-16 14:45:52 +00:00
8760.misc	Add a `custom_headers` param to `make_request` (#8760)	2020-11-16 14:45:22 +00:00