Jason Robinson cee4010f94 Merge branch 'develop' into jaywink/admin-forward-extremities ... # Conflicts: # synapse/rest/admin/__init__.py		2021-01-26 10:15:32 +02:00
..
__init__.py	Merge branch 'develop' into jaywink/admin-forward-extremities	2021-01-26 10:15:32 +02:00
_base.py	…
devices.py	…
event_reports.py	…
groups.py	…
media.py	…
purge_room_servlet.py	…
rooms.py	…
server_notice_servlet.py	…
statistics.py	…
users.py	Add an admin API for shadow-banning users. (#9209)	2021-01-25 14:49:39 -05:00