Merge branch 'develop' into babolivier/message_retention

9e937c28 · Brendan Abolivier · f0ef9708 · f085894c · 9e937c28 · 9e937c28
Commit 9e937c28 authored 5 years ago by Brendan Abolivier
--- a/synapse/rest/admin/groups.py
+++ b/synapse/rest/admin/groups.py
--- a/synapse/rest/admin/rooms.py
+++ b/synapse/rest/admin/rooms.py
--- a/synapse/rest/admin/users.py
+++ b/synapse/rest/admin/users.py
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
--- a/synapse/rest/media/v1/preview_url_resource.py
+++ b/synapse/rest/media/v1/preview_url_resource.py
--- a/synapse/server.py
+++ b/synapse/server.py
--- a/synapse/server_notices/consent_server_notices.py
+++ b/synapse/server_notices/consent_server_notices.py
--- a/synapse/state/__init__.py
+++ b/synapse/state/__init__.py
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
--- a/synapse/storage/data_stores/main/account_data.py
+++ b/synapse/storage/data_stores/main/account_data.py
--- a/synapse/storage/data_stores/main/deviceinbox.py
+++ b/synapse/storage/data_stores/main/deviceinbox.py
--- a/synapse/storage/data_stores/main/end_to_end_keys.py
+++ b/synapse/storage/data_stores/main/end_to_end_keys.py
--- a/synapse/storage/data_stores/main/events.py
+++ b/synapse/storage/data_stores/main/events.py
--- a/synapse/storage/data_stores/main/events_bg_updates.py
+++ b/synapse/storage/data_stores/main/events_bg_updates.py
--- a/synapse/storage/data_stores/main/filtering.py
+++ b/synapse/storage/data_stores/main/filtering.py
--- a/synapse/storage/data_stores/main/group_server.py
+++ b/synapse/storage/data_stores/main/group_server.py
--- a/synapse/storage/data_stores/main/media_repository.py
+++ b/synapse/storage/data_stores/main/media_repository.py
--- a/synapse/storage/data_stores/main/receipts.py
+++ b/synapse/storage/data_stores/main/receipts.py
--- a/synapse/storage/data_stores/main/registration.py
+++ b/synapse/storage/data_stores/main/registration.py