summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-1437-37/+0
* Bump black configuration to target py36 (#9781)Dan Callahan2021-04-131-1/+1
* Bugbear: Add Mutable Parameter fixes (#9682)Jonathan de Jong2021-04-081-2/+4
* Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-061-3/+36
* Add an experimental room version to support restricted join rules. (#9717)Patrick Cloke2021-03-311-1/+6
* Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak2021-03-311-2/+2
* Include m.room.create in invite_room_state for Spaces (#9710)Richard van der Hoff2021-03-301-0/+4
* Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-301-23/+112
* Update the OIDC sample config (#9695)Richard van der Hoff2021-03-291-31/+3
* Make it possible to use dmypy (#9692)Erik Johnston2021-03-261-2/+4
* Increase default join burst ratelimiting (#9674)Erik Johnston2021-03-231-4/+4
* Merge branch 'develop' into babolivier/msc3026Brendan Abolivier2021-03-191-0/+2
|\
| * Initial spaces summary API (#9643)Richard van der Hoff2021-03-181-0/+3
* | Move support for MSC3026 behind an experimental flagBrendan Abolivier2021-03-181-0/+2
|/
* Enable flake8-bugbear, but disable most checks. (#9499)Jonathan de Jong2021-03-166-6/+20
* Add SSO attribute requirements for OIDC providers (#9609)Hubbe2021-03-161-1/+39
* Add support for stable MSC2858 API (#9617)Richard van der Hoff2021-03-161-2/+11
* Clean up config settings for stats (#9604)Richard van der Hoff2021-03-161-17/+28
* JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff2021-03-093-11/+118
* Fix additional type hints. (#9543)Patrick Cloke2021-03-091-1/+4
* quick config comment tweak to clarify allow_profile_lookup_over_federationMatthew Hodgson2021-03-081-2/+1
* Clean up `ShardedWorkerHandlingConfig` (#9466)Erik Johnston2021-02-245-21/+116
* Remove vestiges of uploads_path config (#9462)Richard van der Hoff2021-02-221-1/+0
* Clean up the user directory sample config section (#9385)Andrew Morgan2021-02-221-32/+37
* Ratelimit cross-user key sharing requests. (#8957)Patrick Cloke2021-02-191-0/+10
* Add documentation and type hints to parse_duration. (#9432)Patrick Cloke2021-02-191-2/+15
* Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-191-0/+9
* Add configs to make profile data more private (#9203)AndrewFerr2021-02-192-0/+24
* Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-181-4/+6
* Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-1610-28/+55
* Fix some typos.Patrick Cloke2021-02-122-2/+2
* Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-117-26/+52
|\
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-117-26/+52
* | Combine the CAS & SAML implementations for required attributes. (#9326)Patrick Cloke2021-02-113-23/+53
* | Fix escaping of braces in OIDC sample config. (#9317)Patrick Cloke2021-02-041-5/+5
* | Merge branch 'social_login_hotfixes' into developRichard van der Hoff2021-02-031-10/+4
|\|
| * Clarify documentation about escaping URLs in templates. (#9310)Patrick Cloke2021-02-031-10/+4
* | config: Add detail to auto_join_rooms comment (#9291)dykstranet2021-02-031-0/+2
* | Convert blacklisted IPv4 addresses to compatible IPv6 addresses. (#9240)Patrick Cloke2021-02-032-27/+91
|/
* Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-021-4/+4
* Put OIDC callback URI under /_synapse/client. (#9288)Richard van der Hoff2021-02-011-1/+1
* Merge branch 'social_login' into developRichard van der Hoff2021-02-011-0/+37
|\
| * Collect terms consent from the user during SSO registration (#9276)Richard van der Hoff2021-02-011-0/+22
| * Improve styling and wording of SSO UIA templates (#9286)Richard van der Hoff2021-02-011-0/+15
* | Merge branch 'social_login' into developRichard van der Hoff2021-02-013-39/+50
|\|
| * Replace username picker with a template (#9275)Richard van der Hoff2021-02-013-38/+37
| * Improve styling and wording of SSO redirect confirm template (#9272)Richard van der Hoff2021-02-011-1/+13
* | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-0/+19
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-281-28/+39
|\|
| * Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-271-25/+27
| * Support for scraping email addresses from OIDC providers (#9245)Richard van der Hoff2021-01-271-3/+12
* | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-282-3/+12
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-273-0/+33
|\|
| * Implement MSC2858 support (#9183)Richard van der Hoff2021-01-273-0/+33
* | Clean-up the template loading code. (#9200)Patrick Cloke2021-01-274-23/+29
* | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-262-7/+8
* | Precompute joined hosts and store in Redis (#9198)Erik Johnston2021-01-261-0/+2
|/
* Add a check for duplicate IdP ids (#9184)Richard van der Hoff2021-01-211-0/+11
* Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+24
* Tighten the restrictions on `idp_id` (#9177)Richard van der Hoff2021-01-201-3/+9
* Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-202-1/+21
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-207-51/+30
* Fix error messages from OIDC config parsing (#9153)Richard van der Hoff2021-01-191-10/+15
* Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-181-1/+17
* Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-152-143/+188
* Remote dependency on distutils (#9125)Richard van der Hoff2021-01-151-6/+5
* Store an IdP ID in the OIDC session (#9109)Richard van der Hoff2021-01-151-3/+23
* Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-131-0/+10
* Add jsonschema verification for the oidc provider configRichard van der Hoff2021-01-131-0/+50
* Extract OIDCProviderConfig objectRichard van der Hoff2021-01-131-45/+120
* Fix validate_config on nested objects (#9054)Richard van der Hoff2021-01-081-1/+1
* Allow running sendToDevice on workers (#9044)Erik Johnston2021-01-071-1/+9
* Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-051-0/+27
* Update the value of group_creation_prefix in sample config. (#8992)Jerin J Titus2020-12-291-1/+1
* Send the location of the web client to the IS when inviting via 3PIDs. (#8930)Patrick Cloke2020-12-181-0/+22
* Implement a username picker for synapse (#8942)Richard van der Hoff2020-12-181-2/+3
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-183-7/+27
* Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-162-12/+12
* Various clean-ups to the logging context code (#8935)Patrick Cloke2020-12-141-1/+1
* Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-093-61/+98
* Better formatting for config errors from modules (#8874)Richard van der Hoff2020-12-0810-27/+59
* Clarify config template comments (#8891)Richard van der Hoff2020-12-082-8/+4
* Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-041-0/+10
* Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-021-15/+25
* Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-301-0/+13
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-15/+20
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-191-0/+10
* SAML: Document allowing a clock/time difference from IdP (#8731)Marcus Schopen2020-11-181-0/+6
* Clarify the usecase for an msisdn delegate (#8734)Adrian Wannenmacher2020-11-141-2/+3
* SAML: add <mdui:UIInfo> element examples (#8718)Marcus Schopen2020-11-131-0/+22
* Improve the sample config for SSO (OIDC, SAML, and CAS). (#8635)Patrick Cloke2020-10-303-54/+80
* Support generating structured logs in addition to standard logs. (#8607)Patrick Cloke2020-10-291-48/+48
* Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-235-5/+5
* Send some ephemeral events to appservices (#8437)Will Hunt2020-10-151-0/+3
* Increase default max_upload_size from 10M to 50M (#8502)Mateusz Przybyłowicz2020-10-091-2/+2
* Update default room version to 6 (#8461)Richard van der Hoff2020-10-051-1/+1
* Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-021-0/+18
* Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-024-6/+15
|\
| * Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-024-6/+15
* | Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-011-0/+9
* | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-011-9/+9
|/
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-014-5/+30
* Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-301-0/+8
* Update description of server_name config option (#8415)Aaron Raimist2020-09-291-4/+17
* Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-251-0/+6
* Merge branch 'master' into developAndrew Morgan2020-09-241-2/+8
|\
| * Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)Andrew Morgan2020-09-242-3/+11
* | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-183-3/+3
* | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-172-3/+0
* | Improve SAML error messages (#8248)Patrick Cloke2020-09-141-30/+4
* | Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-143-13/+46
* | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-3/+9
* | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-1/+32
* | Fix stack overflow when logging system encounters an error (#8268)Richard van der Hoff2020-09-071-2/+23
|/
* Fix a regression from calling read_templates. (#8252)Patrick Cloke2020-09-041-1/+1
* Stop sub-classing object (#8249)Patrick Cloke2020-09-048-10/+10
* Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-043-46/+13
* Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-023-13/+46
* Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-8/+14
* Add resources.consent conditional dependency back (#8107)Andrew Morgan2020-08-181-20/+0
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-174-105/+191
* Move setting of Filter into code.Erik Johnston2020-08-111-8/+16
* Change the default log config to reduce disk I/O and storage (#8040)Erik Johnston2020-08-111-5/+36
* Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-112-0/+99
* TypoBrendan Abolivier2020-08-101-1/+1
* LintBrendan Abolivier2020-08-101-2/+2
* why mypy whyBrendan Abolivier2020-08-101-1/+3
* LintBrendan Abolivier2020-08-061-1/+1
* Incorporate reviewBrendan Abolivier2020-08-061-2/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_p...Brendan Abolivier2020-08-062-1/+25
|\
| * Rename database classes to make some sense (#8033)Erik Johnston2020-08-051-1/+4
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-312-18/+7
| |\
| * | Add ratelimiting on joinsErik Johnston2020-07-311-0/+21
* | | Incorporate reviewBrendan Abolivier2020-08-061-0/+3
* | | Back out the database hack and replace it with a temporary config settingBrendan Abolivier2020-08-031-0/+10
| |/ |/|
* | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-305-15/+73
|\|
| * Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-295-15/+73
* | Various improvements to the docs (#7899)Aaron Raimist2020-07-291-18/+0
* | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-281-0/+7
|/
* Fix a typo in the sample config. (#7890)Adrian2020-07-201-1/+1
* Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-201-1/+1
* Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-2/+4
* Allow moving typing off master (#7869)Erik Johnston2020-07-161-9/+10
* Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-164-37/+48
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-141-6/+112
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-0/+28
* Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-131-1/+6
* Add ability to shard the federation sender (#7798)Erik Johnston2020-07-103-66/+132
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-1/+1
* Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-061-4/+31
* isort 5 compatibility (#7786)Will Hunt2020-07-052-2/+2
* Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-3/+103
* Support running multiple media repos. (#7706)Erik Johnston2020-06-171-0/+6
* fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
* Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-16/+7
* Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-162-102/+157
* Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-2/+2
* fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
* Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-101-5/+15
* Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-102-0/+82
* Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+8
* Add support for webp thumbnailing (#7586)WGH2020-06-051-0/+1
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-1/+7
* Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-033-76/+105
* Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-5/+13
* Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
* Fix up commentsErik Johnston2020-05-271-2/+2
* Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-5/+39
* Add option to move event persistence off master (#7517)Erik Johnston2020-05-222-2/+29
* Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-226-29/+36
* Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-141-0/+17
* Fix copypasted comment (#7477)Paul Tötterman2020-05-131-1/+1
* Fix new flake8 errors (#7470)Erik Johnston2020-05-121-1/+1
* Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-113-6/+166
* Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-1/+0
|\
| * Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-071-1/+0
* | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-081-8/+30
* | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-084-7/+191
|/
* Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-071-0/+15
* Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-291-3/+8
* Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
* Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-271-0/+6
* Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-231-0/+21
* Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-222-0/+37
* Fix indention in generated config file (#7300)Lars Franke2020-04-201-22/+22
* Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-0/+6
* Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
* Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+29
* Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-091-0/+7
* Fix --help commandline argument (#7249)Richard van der Hoff2020-04-091-16/+8
* Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-2/+14
* Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-031-3/+8
* Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
* Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+15
* Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+27
* Don't default to an invalid sqlite config if no database configuration is pro...Nektarios Katakis2020-03-261-22/+47
* Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+39
* Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-5/+0
* Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-36/+59
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-17/+0
* LintBrendan Abolivier2020-03-111-2/+1
* Put the file in the templates directoryBrendan Abolivier2020-03-111-12/+21
* Update wording and configBrendan Abolivier2020-03-111-0/+3
* Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-111-18/+11
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+17
|\
| * Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| * updates after reviewdklimpel2020-03-091-8/+8
| * add disable_3pid_changesdklimpel2020-03-081-0/+6
| * lint2dklimpel2020-03-081-2/+2
| * changelogdklimpel2020-03-081-2/+2
| * Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-0/+11
* | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
* | LintBrendan Abolivier2020-03-101-1/+1
* | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-101-0/+26
* | Merge branch 'master' into developBrendan Abolivier2020-03-033-0/+96
|\ \ | |/ |/|
| * Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-031-1/+1
| * Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-0/+18
| * Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-023-0/+78
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-212-3/+3
|/
* Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-0/+19
|\
| * Linters are hard but in they end they just want what's best for usBrendan Abolivier2020-02-131-1/+1
| * Add a separator for the config warningBrendan Abolivier2020-02-131-1/+1
| * Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+19
* | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-2/+14
|/
* Allow empty federation_certificate_verification_whitelist (#6849)timfi2020-02-061-0/+2
* Fix empty account_validity config blockAndrew Morgan2020-01-201-1/+2
* Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-171-0/+8
* Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-171-0/+1
* Clarify the `account_validity` and `email` sections of the sample configurati...Richard van der Hoff2020-01-173-140/+167
* Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
|\
| * RewordBrendan Abolivier2020-01-071-3/+3
| * Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| * Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
* | Add experimental 'databases' config (#6580)Erik Johnston2020-01-061-13/+42
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-1/+8
* | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-031-2/+15
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-5/+0
|/
* Split state groups into a separate data store (#6296)Erik Johnston2019-12-201-5/+5
* Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+15
* Add database config class (#6513)Erik Johnston2019-12-181-16/+62
* Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+13
* Bump version of mypyErik Johnston2019-12-123-4/+4
* Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-60/+126
* privacy by default for room dir (#6355)Neil Johnson2019-12-041-12/+14
* Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+2
* Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-1/+16
* Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-1/+182
|\
| * Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-265-11/+11
| |\
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-02 07:42:47 +0000