summary refs log tree commit diff
path: root/docs/sample_config.yaml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make sync response cache time configurable. (#10513)Richard van der Hoff2021-08-031-0/+9
* Allow setting transaction limit for db connections (#10440)Toni Spets2021-08-021-0/+4
* Port the ThirdPartyEventRules module interface to the new generic interface (...Brendan Abolivier2021-07-201-13/+0
* Add a module type for account validity (#9884)Brendan Abolivier2021-07-161-85/+0
* Merge tag 'v1.38.0rc2' into developErik Johnston2021-07-091-1/+2
|\
| * Fix broken links in INSTALL.md (#10331)Dirk Klimpel2021-07-081-1/+2
* | Remove functionality associated with unused historical stats tables (#9721)Cristina2021-07-081-5/+0
|/
* Update links to documentation in sample config (#10287)Dirk Klimpel2021-07-071-21/+23
* Add support for evicting cache entries based on last access time. (#10205)Erik Johnston2021-07-051-28/+34
* Implement config option `sso.update_profile_information` (#10108)jkanefendt2021-06-211-0/+11
* Standardise the module interface (#10062)Brendan Abolivier2021-06-181-13/+16
* Remove support for ACME v1 (#10194)Brendan Abolivier2021-06-171-81/+3
* Always require users to re-authenticate for dangerous operations. (#10184)Patrick Cloke2021-06-161-0/+4
* Mention that you need to configure max upload size in reverse proxy as well (...Aaron Raimist2021-06-101-0/+4
* Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-261-15/+0
* Remove tls_fingerprints option (#9280)Jerin J Titus2021-05-241-27/+0
* Enable experimental spaces by default. (#10011)Patrick Cloke2021-05-241-0/+15
* Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-141-6/+14
* Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-111-0/+1
* Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-111-0/+6
* Limit how often GC happens by time. (#9902)Erik Johnston2021-05-051-0/+10
* Add port parameter to the sample config for psycopg2 args (#9911)Andrew Morgan2021-05-041-0/+1
* Rename handler and config modules which end in handler/config. (#9816)Patrick Cloke2021-04-201-1/+1
* Port "Allow users to click account renewal links multiple times without hitti...Andrew Morgan2021-04-191-63/+85
* Add a Synapse Module for configuring presence update routing (#9491)Andrew Morgan2021-04-061-2/+21
* Make sample config allowed_local_3pids regex stricter. (#9719)Denis Kasak2021-03-311-2/+2
* Replace `room_invite_state_types` with `room_prejoin_state` (#9700)Richard van der Hoff2021-03-301-8/+25
* Update the OIDC sample config (#9695)Richard van der Hoff2021-03-291-31/+3
* Increase default join burst ratelimiting (#9674)Erik Johnston2021-03-231-2/+2
* Add SSO attribute requirements for OIDC providers (#9609)Hubbe2021-03-161-0/+24
* Add support for stable MSC2858 API (#9617)Richard van der Hoff2021-03-161-1/+1
* Clean up config settings for stats (#9604)Richard van der Hoff2021-03-161-12/+13
* JWT OIDC secrets for Sign in with Apple (#9549)Richard van der Hoff2021-03-091-1/+20
* Fixup sample configErik Johnston2021-03-091-2/+1
* Clean up the user directory sample config section (#9385)Andrew Morgan2021-02-221-18/+29
* Add a config option to prioritise local users in user directory search result...Andrew Morgan2021-02-191-0/+5
* Add configs to make profile data more private (#9203)AndrewFerr2021-02-191-0/+14
* Parse ui_auth.session_timeout as a duration (instead of treating it as ms) (#...Rishabh Arya2021-02-181-3/+3
* Fix sample configAndrew Morgan2021-02-121-1/+1
* Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-111-11/+9
|\
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-111-11/+9
* | 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-031-0/+8
|/
* Put SAML callback URI under /_synapse/client. (#9289)Richard van der Hoff2021-02-021-2/+2
* 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-011-2/+44
|\|
| * Replace username picker with a template (#9275)Richard van der Hoff2021-02-011-1/+31
| * 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/+10
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-281-7/+21
|\|
| * Add 'brand' field to MSC2858 response (#9242)Richard van der Hoff2021-01-271-4/+9
| * 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-281-1/+5
* | Do not require the CAS service URL setting (use public_baseurl instead). (#9199)Patrick Cloke2021-01-261-4/+0
|/
* Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-4/+9
* Support icons for Identity Providers (#9154)Richard van der Hoff2021-01-201-0/+4
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-201-14/+17
* Land support for multiple OIDC providers (#9110)Richard van der Hoff2021-01-151-133/+141
* Give the user a better error when they present bad SSO credsRichard van der Hoff2021-01-131-0/+8
* Add initial support for a "pick your IdP" page (#9017)Richard van der Hoff2021-01-051-0/+25
* 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/+6
* 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-181-0/+15
* Fix the sample config location for the ip_range_whitelist setting. (#8954)Patrick Cloke2020-12-161-12/+12
* Default to blacklisting reserved IP ranges and add a whitelist. (#8870)Patrick Cloke2020-12-091-21/+45
* Clarify config template comments (#8891)Richard van der Hoff2020-12-081-8/+4
* Add authentication to replication endpoints. (#8853)Patrick Cloke2020-12-041-0/+7
* Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-021-6/+8
* Add a config option to change whether unread push notification counts are per...Andrew Morgan2020-11-301-0/+10
* Fix the formatting of push config section (#8818)Andrew Morgan2020-11-251-14/+19
* SAML: Allow specifying the IdP entityid to use. (#8630)Ben Banfield-Zanin2020-11-191-0/+8
* 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-301-50/+76
* Fix typos and spelling errors. (#8639)Patrick Cloke2020-10-231-3/+3
* Increase default max_upload_size from 10M to 50M (#8502)Mateusz Przybyłowicz2020-10-091-1/+1
* 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/+5
* Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-011-0/+8
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-011-0/+12
* 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/+5
* Improve SAML error messages (#8248)Patrick Cloke2020-09-141-26/+4
* Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-3/+7
* Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-0/+18
* Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-8/+14
* Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-171-3/+1
* Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-111-0/+11
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-311-18/+15
|\
| * Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-07-301-0/+54
| |\
| * | Various improvements to the docs (#7899)Aaron Raimist2020-07-291-18/+11
| * | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-281-0/+4
* | | Add ratelimiting on joinsErik Johnston2020-07-311-0/+12
| |/ |/|
* | Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-291-0/+54
|/
* 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-1/+3
* Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-141-2/+69
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-0/+21
* Add ability to shard the federation sender (#7798)Erik Johnston2020-07-101-32/+33
* Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-061-4/+31
* Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-2/+58
* fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
* Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-1/+1
* fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
* Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-101-0/+20
* Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+7
* Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-031-66/+96
* Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-1/+7
* Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
* Fix up commentsErik Johnston2020-05-271-1/+1
* Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-0/+6
* Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-221-26/+35
* Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-111-4/+39
* Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-081-4/+11
* Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-081-0/+95
* Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-071-0/+12
* 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/+10
* Fix indention in generated config file (#7300)Lars Franke2020-04-201-26/+26
* 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/+25
* Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-1/+13
* 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/+4
* Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+23
* Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+35
* Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-4/+0
* Improve database configuration docs (#6988)Richard van der Hoff2020-03-201-5/+38
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-13/+0
* Put the file in the templates directoryBrendan Abolivier2020-03-111-7/+16
* Update wording and configBrendan Abolivier2020-03-111-0/+3
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+13
|\
| * Update sample_config.yamlDirk Klimpel2020-03-101-1/+1
| * updates after reviewdklimpel2020-03-091-5/+5
| * add disable_3pid_changesdklimpel2020-03-081-0/+5
| * lint2dklimpel2020-03-081-2/+2
| * changelogdklimpel2020-03-081-0/+8
* | Update sample configBrendan Abolivier2020-03-101-0/+7
* | Merge branch 'master' into developBrendan Abolivier2020-03-031-0/+50
|\ \ | |/ |/|
| * Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-3/+19
| * Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-0/+34
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-4/+5
|/
* Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-0/+5
|\
| * Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+5
* | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-1/+11
|/
* Clarify the `account_validity` and `email` sections of the sample configurati...Richard van der Hoff2020-01-171-132/+152
* 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
| * Update sample configBrendan Abolivier2020-01-031-1/+1
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-4/+0
|/
* Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+13
* Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+7
* Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-18/+43
* privacy by default for room dir (#6355)Neil Johnson2019-12-041-6/+7
* Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-1/+16
* Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-261-5/+5
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-141-1/+1
| |\
| | * Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-1/+1
| | |\
| | | * Set room version default to 5Neil Johnson2019-10-191-1/+1
| * | | sample configAndrew Morgan2019-11-121-4/+4
| |/ /
* / / Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+63
|/ /
* | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
* | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-1/+7
* | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-231-15/+15
|/
* cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+1
* Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-261-1/+1
* Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-261-4/+10
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-251-51/+90
|\
| * Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-1/+18
| |\
| | * Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-0/+2
| | * Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+59
| | |\
| | | * Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-191-27/+95
| | | |\
| | * | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-0/+3
| * | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-191-27/+95
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+26
| | |_|/ | |/| |
| * | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+59
* | | | Review commentsErik Johnston2019-09-251-1/+1
* | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+6
| |_|/ |/| |
* | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-0/+12
* | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
| |/ |/|
* | fix sample configRichard van der Hoff2019-09-181-1/+1
* | (#5849) Convert rst to markdown (#6040)dstipp2019-09-171-6/+6
* | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+5
* | Update sample configErik Johnston2019-09-111-1/+1
* | Update sample configErik Johnston2019-09-111-0/+7
* | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+7
|\ \
| * | Default to censoring redactions after seven daysErik Johnston2019-09-091-3/+5
| * | Make redaction retention period configurableErik Johnston2019-09-051-0/+5
* | | Servers-known-about statistic (#5981)Amber Brown2019-09-071-0/+10
* | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-061-13/+43
|/ /
* | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
* | Config templating (#5900)Jorik Schellekens2019-08-281-8/+8
* | Fixup review commentsErik Johnston2019-08-231-2/+2
* | Add config option for keys to use to sign keysErik Johnston2019-08-211-0/+8
|/
* Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-131-0/+7
* LintBrendan Abolivier2019-08-011-1/+1
* Sample configBrendan Abolivier2019-08-011-0/+10
* Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-301-4/+0
* Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-0/+17
* Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-231-0/+16
* Opentracing Documentation (#5703)Jorik Schellekens2019-07-221-12/+2
* Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-181-14/+31
* Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+11
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+17
* Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-011-1/+24
|\
| * Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-281-0/+9
| * Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-271-0/+6
| * Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
* | update sample configRichard van der Hoff2019-06-271-6/+13
* | update sample configRichard van der Hoff2019-06-261-0/+13
|/
* Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-241-1/+1
|\
| * Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-241-1/+1
* | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-241-4/+8
|\ \ | |/ |/|
| * Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-4/+8
* | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-241-0/+7
|/
* Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-221-23/+0
* Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+13
* Set default room version to v4. (#5379)Neil Johnson2019-06-061-1/+1
* Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-10/+50
* Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-061-6/+37
* Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-051-0/+16
|\
| * Neilj/mau tracking config explainer (#5284)Neil Johnson2019-06-051-0/+16
* | Update sample configRichard van der Hoff2019-06-051-4/+4
|/
* Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-1/+3
|\
| * Sample configBrendan Abolivier2019-05-311-1/+1
| * Sample configBrendan Abolivier2019-05-311-8/+3
| * Config and changelogBrendan Abolivier2019-05-281-0/+7
* | regenerate sample configAmber Brown2019-05-291-3/+3
* | Add missing blank line in config (#5249)Richard van der Hoff2019-05-241-0/+1
* | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-0/+9
* | Room Statistics (#4338)Amber Brown2019-05-211-0/+16
|/
* DocBrendan Abolivier2019-05-211-0/+8
* Changelog + sample configBrendan Abolivier2019-05-161-0/+6
* Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-28/+25
* Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+18
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+14
* Fix sample configRichard van der Hoff2019-05-061-1/+1
* Merge branch 'master' into developRichard van der Hoff2019-05-031-5/+12
|\
| * more config comment updatesRichard van der Hoff2019-05-031-2/+5
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-28 16:52:40 +0000