summary refs log tree commit diff
path: root/docs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-121-0/+2
* Improved docs on setting up Postgresql (#5661)Lrizika2019-07-111-4/+15
* Add basic opentracing support (#5544)Jorik Schellekens2019-07-111-0/+17
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-19/+19
* Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-012-3/+28
|\
| * 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
| * Merge pull request #5313 from twrist/patch-1Richard van der Hoff2019-06-271-2/+4
| |\
| | * Update HAProxy example rulesIke Johnson2019-06-021-2/+4
* | | update sample configRichard van der Hoff2019-06-271-6/+13
* | | update sample configRichard van der Hoff2019-06-261-0/+13
|/ /
* | Merge branch 'master' into developAndrew Morgan2019-06-251-1/+1
|\ \
| * | Fix broken link in MSC1711 FAQRichard van der Hoff2019-06-251-1/+1
* | | Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-241-45/+42
* | | 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
* | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
* | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+7
* | | Run Black. (#5482)Amber Brown2019-06-201-79/+79
* | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-181-2/+2
* | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-141-0/+13
|\ \ \ | |/ / |/| |
| * | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+13
* | | Neilj/improve federation docs (#5419)Neil Johnson2019-06-112-3/+91
|/ /
* | 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
* | Neilj/1.0 upgrade notes (#5371)Neil Johnson2019-06-061-7/+5
* | Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-052-6/+21
|\ \
| * | Fix notes about well-known and acme (#5357)Richard van der Hoff2019-06-051-6/+5
| * | 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
* | | Clarify that the admin change password endpoint logs them out (#5303)Travis Ralston2019-05-311-1/+1
* | | Merge pull request #5283 from aaronraimist/captcha-docsErik Johnston2019-05-291-0/+1
|\ \ \
| * | | Specify the type of reCAPTCHA key to use (#5013)Aaron Raimist2019-05-281-0/+1
* | | | regenerate sample configAmber Brown2019-05-291-3/+3
* | | | Fix docs on resetting the user directory (#5036)Aaron Raimist2019-05-281-7/+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
| |/ |/|
* | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-211-0/+8
|\|
| * DocBrendan Abolivier2019-05-211-0/+8
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-05-171-23/+22
|\ \ | |/ |/|
| * Stop telling people to install the optional dependencies. (#5197)Richard van der Hoff2019-05-171-23/+22
* | 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
|/
* Make Prometheus snippet less confusing on the metrics collection doc (#4288)Gergely Polonkai2019-05-101-1/+4
* Add AllowEncodedSlashes to apache (#5068)colonelkrud2019-05-091-0/+2
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+14
* Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-071-2/+0
* Fix spelling in server notices admin API docs (#5142)Travis Ralston2019-05-061-1/+1
* 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
| * Blacklist 0.0.0.0 and :: by default for URL previewsRichard van der Hoff2019-05-031-5/+9
* | Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-022-19/+54
* | Merge pull request #5124 from matrix-org/babolivier/aliasesBrendan Abolivier2019-05-021-0/+5
|\ \
| * | Add some limitations to alias creationBrendan Abolivier2019-05-021-0/+5
* | | Fix sample configRichard van der Hoff2019-05-011-2/+2
* | | Move admin API to a new prefixRichard van der Hoff2019-05-018-12/+12
|/ /
* | Merge pull request #5116 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-05-011-1/+1
|\ \
| * | Fix whole path for admin routeBrendan Abolivier2019-05-011-1/+1
| * | Fix typo in account validity admin routeBrendan Abolivier2019-05-011-1/+1
* | | Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-252-1/+34
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-173-0/+27
|\ \
| * \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-3/+26
| |\ \
| * \ \ Merge pull request #5063 from matrix-org/erikj/move_endpointsErik Johnston2019-04-151-0/+6
| |\ \ \
| | * | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+3
| | * | | Move some rest endpoints to client readerErik Johnston2019-04-151-0/+3
| * | | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-091-0/+6
| |\ \ \ \
| * | | | | add context to phonehome stats (#5020)Neil Johnson2019-04-081-0/+3
| * | | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+4
| | |/ / / | |/| | |
| * | | | Add admin API for group deletionErik Johnston2019-04-031-0/+14
| | |_|/ | |/| |
* | | | Add management endpoints for account validityBrendan Abolivier2019-04-171-0/+42
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-3/+26
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-091-0/+6
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-0/+14
* Fix nginx example in ACME doc. (#4923)Richard van der Hoff2019-03-251-1/+1
* Update Apache Setup To Remove Location Syntax (#4870)Colin W2019-03-211-9/+5
* Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-211-0/+6
|\
| * Fix up config commentsErik Johnston2019-03-201-3/+4
| * Add option to disable search room listsErik Johnston2019-03-191-0/+5
* | Merge pull request #4895 from matrix-org/erikj/disable_user_searchErik Johnston2019-03-201-0/+5
|\ \
| * | Fix up sample configErik Johnston2019-03-201-2/+4
| * | Update sample configErik Johnston2019-03-191-0/+3
| |/
* / Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-0/+8
|/
* Add note on tuning postgresErik Johnston2019-03-191-2/+20
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-03-192-5/+3
|\
| * Repoint docs for federation (#4881)Michael Kaye2019-03-191-1/+1
| * fix some typos in federate.mdRichard van der Hoff2019-03-151-4/+2
* | Comment out most options in the generated config. (#4863)Richard van der Hoff2019-03-191-73/+80
* | Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-0/+6
* | Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-11/+28
* | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-131-0/+5
* | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-121-0/+125
|\|
| * fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| * Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-121-0/+126
* | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-111-2/+2
* | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-072-10/+20
* | Update sample configBrendan Abolivier2019-03-051-11/+13
* | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+22
|\ \
| * | add API documentationJoseph Weston2019-03-021-0/+22
* | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-0/+11
* | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-051-0/+2
|\ \ \
| * | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-041-0/+2
* | | | Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-042-0/+1048
|/ / /
* / / Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-041-7/+5
|/ /
* | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-271-0/+1
|\ \
| * | Move /account/3pid to client_readerErik Johnston2019-02-271-0/+1
* | | Move server key queries to federation readerErik Johnston2019-02-271-0/+1
|/ /
* | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-271-1/+3
|\ \ | |/ |/|
| * Fix tightloop over connecting to replication serverErik Johnston2019-02-261-1/+3
* | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
|/
* Minor tweaks to acme docs (#4689)Richard van der Hoff2019-02-221-10/+9
* Added HAProxy example (#4660)Benoît S2019-02-211-0/+18
* Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-191-1/+25
|\
| * DocsErik Johnston2019-02-191-0/+5
| * DocumentationErik Johnston2019-02-191-1/+20
* | Update worker docsErik Johnston2019-02-181-1/+2
|/
* Update docsErik Johnston2019-02-181-0/+6
* Merge tag 'v0.99.1'Richard van der Hoff2019-02-143-11/+110
|\
| * Clarifications for reverse proxy docs (#4607)Richard van der Hoff2019-02-113-11/+110
| * Update MSC1711 FAQ to be explicit about well-known (#4584)Erik Johnston2019-02-071-13/+27
* | Update MSC1711_certificates_FAQ.mdErik Johnston2019-02-081-1/+1
* | cleanupsRichard van der Hoff2019-02-071-4/+2
* | Merge branch 'master' into erikj/msc1711_faqRichard van der Hoff2019-02-072-12/+16
|\|
| * Merge remote-tracking branch 'origin/release-v0.99.0'Richard van der Hoff2019-02-071-11/+15
| |\
| | * Update ACME docs to include port instructions (#4578) github/release-v0.99.0 release-v0.99.0Andrew Morgan2019-02-071-11/+15
| * | clarify option 1Richard van der Hoff2019-02-071-1/+1
* | | Update MSC1711 FAQ to be explicit about well-knownErik Johnston2019-02-071-11/+27
|/ /
* / faq cleanupsRichard van der Hoff2019-02-051-36/+18
|/
* Add notes on SRV and .well-known (#4573)Richard van der Hoff2019-02-051-41/+117
* Merge pull request #4570 from matrix-org/anoa/self_signed_upgradeAndrew Morgan2019-02-051-0/+126
|\
| * Add TL;DR and final step details to ACMEAndrew Morgan2019-02-051-4/+20
| * Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse into...Andrew Morgan2019-02-051-1/+1
| |\
| | * Update docs/ACME.mdRichard van der Hoff2019-02-051-2/+2
| * | Update ACMEAndrew Morgan2019-02-051-14/+17
| |/
| * Actually add ACME docsAndrew Morgan2019-02-051-0/+107
| * Convert ACME docs to mdAndrew Morgan2019-02-051-98/+0
| * Move ACME docs to docs/ACME.rst and link from UPGRADE.Andrew Morgan2019-02-051-0/+98
* | Neilj/1711faq (#4572)Neil Johnson2019-02-051-0/+260
|/
* Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-281-3/+2
* create support user (#4141)Neil Johnson2018-12-141-4/+7
* Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-271-1/+57
* Add a note saying you need to manually reclaim disk spaceAaron Raimist2018-11-181-0/+8
* Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-4/+36
* Update documentation and templates for new consentTravis Ralston2018-10-122-10/+18
* Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-231-1/+1
|\
| * Reference that the federation_reader needs the HTTP replication port setTravis Ralston2018-08-211-1/+1
* | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-0/+1
|\ \ | |/ |/|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-172-1/+14
| |\
| * | Update workers.rst with new pathsErik Johnston2018-08-071-0/+1
* | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+8
| |/ |/|
* | Update the admin register documentation to return a real user IDTravis Ralston2018-08-171-1/+1
* | Update docs/workers.rstErik Johnston2018-08-091-0/+13
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-231-0/+63
|\
| * Admin API for creating new users (#3415)Amber Brown2018-07-201-0/+63
* | Update docs/workers.rstErik Johnston2018-07-231-0/+4
|/
* update doc for deactivate APIMatthew Hodgson2018-06-261-2/+15
* Fix metric documentation tables (#3341)Amber Brown2018-06-061-20/+30
* Merge pull request #3340 from ArchangeGabriel/patch-1Richard van der Hoff2018-06-051-9/+9
|\
| * doc/postgres.rest: fix displaying of the last command blockBruno Pagani2018-06-041-9/+9
* | code_style.rst: formattingRichard van der Hoff2018-05-311-1/+1
* | Run Prometheus on a different port, optionally. (#3274)Amber Brown2018-05-311-11/+66
* | Let users leave the server notice room after joiningRichard van der Hoff2018-05-251-2/+5
|/
* Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-231-3/+6
* consent_tracking.md: clarify linkRichard van der Hoff2018-05-231-1/+1
* minor post-review tweaksRichard van der Hoff2018-05-232-5/+5
* mention public_baseurlRichard van der Hoff2018-05-231-0/+9
* fix wrappingRichard van der Hoff2018-05-231-1/+3
* Using the manhole to send server noticesRichard van der Hoff2018-05-231-0/+13
* Notes on the manholeRichard van der Hoff2018-05-231-0/+43
* consent_tracking: formatting etcRichard van der Hoff2018-05-231-8/+7
* server_notices.md: fix linkRichard van der Hoff2018-05-231-2/+2
* consent tracking docsRichard van der Hoff2018-05-233-25/+154
* Some docs about server noticesRichard van der Hoff2018-05-231-0/+53
* Add a 'has_consented' template var to consent formsRichard van der Hoff2018-05-222-1/+7
* Merge branch 'master' into developNeil Johnson2018-05-181-9/+23
|\
| * postgres.rst: Add instructions how to setup the postgres user and clarify the...rubo772018-05-171-9/+23
* | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-153-0/+51
|/
* Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"Richard van der Hoff2018-04-091-11/+0
* Merge pull request #2886 from turt2live/travis/new-worker-docsRichard van der Hoff2018-04-051-2/+9
|\
| * Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docsTravis Ralston2018-04-043-9/+45
| |\
| * | Document the additional routes for the event_creator workerTravis Ralston2018-04-041-1/+3
| * | Move the mention of the main synapse worker higher upTravis Ralston2018-04-041-13/+6
| * | Add a blurb explaining the main synapse workerTravis Ralston2018-02-171-0/+12
* | | Remove redundant metrics which were deprecated in 0.27.0.Richard van der Hoff2018-04-041-0/+11
| |/ |/|
* | Merge pull request #3002 from matrix-org/rav/purge_docErik Johnston2018-03-151-2/+4
|\ \
| * | Update purge_history_api.rstRichard van der Hoff2018-03-151-2/+4
* | | OCD: Make the event_creator routes regex a code blockTravis Ralston2018-03-141-1/+1
|/ /
* | Add transactional API to history purgeRichard van der Hoff2018-03-121-0/+27
* | Factor run_in_background out from preserve_fnRichard van der Hoff2018-03-081-4/+4
* | Provide a means to pass a timestamp to purge_historyRichard van der Hoff2018-03-051-2/+9
|/
* Merge pull request #2854 from matrix-org/erikj/event_create_workerErik Johnston2018-02-131-5/+34
|\
| * Update docsErik Johnston2018-02-131-1/+4
| * Update workers docs to include http portErik Johnston2018-02-121-5/+20
| * Add note in docs/workers.rstErik Johnston2018-02-071-0/+11
* | Fix typos in purge api & docRichard van der Hoff2018-02-131-1/+1
* | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-091-2/+12
|\ \ | |/ |/|
| * delete_local_events for purge_historyRichard van der Hoff2018-02-091-2/+12
* | Add admin api documentation for list media endpointTravis Ralston2018-01-311-0/+23
|/
* document metrics changesRichard van der Hoff2018-01-161-7/+54
* Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-221-1/+4
* Improve documentation of workersRichard van der Hoff2017-11-211-21/+133
* Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-141-4/+0
* simplify instructions for regenerating user_dirMatthew Hodgson2017-11-041-0/+17
* Factor _AccountHandler proxy out to ModuleApiRichard van der Hoff2017-11-021-1/+1
* Merge pull request #2624 from matrix-org/rav/password_provider_notify_logoutDavid Baker2017-11-021-0/+10
|\
| * Notify auth providers on logoutRichard van der Hoff2017-11-011-0/+10
* | Allow password_auth_providers to return a callbackRichard van der Hoff2017-11-011-0/+5
|/
* Let password auth providers handle arbitrary login typesRichard van der Hoff2017-11-011-10/+43
* DB schema interface for password auth providersRichard van der Hoff2017-10-311-0/+12
* Start some documentation on password providersRichard van der Hoff2017-10-311-0/+39
* move url_previews to MD as RST does my head inMatthew Hodgson2017-10-291-0/+2
* Document import rulesRichard van der Hoff2017-10-261-0/+44
* code_style: more formattingRichard van der Hoff2017-10-261-34/+57
* code_style.rst: a couple of tidyupsRichard van der Hoff2017-10-261-9/+9
* Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0Erik Johnston2017-10-231-1/+1
|\
| * oopsMatthew Hodgson2017-10-131-1/+1
| * fix copyright to companies which actually exist(ed)Matthew Hodgson2017-10-131-1/+1
* | make it absolutely clear that Purge History API does not remove all traces of...Ander Punnar2017-10-141-0/+2
|/
* Document known to work postgres versionPaul Tötterman2017-09-011-0/+2
* clarify metric setup to use 'scrape_configs' section of yaml and use an array...Sean Enck2017-04-211-3/+2
* Document some of the admin APIs (#2143)Richard van der Hoff2017-04-211-0/+73
* Remove last reference to worker_replication_urlErik Johnston2017-04-121-1/+2
* Update replication docsErik Johnston2017-04-111-22/+4
* Update workers docsErik Johnston2017-04-111-10/+5
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s...Erik Johnston2017-04-043-10/+45
|\
| * Merge pull request #2011 from matrix-org/matthew/turn_allow_guestsErik Johnston2017-03-311-4/+34
| |\
| | * add setting (on by default) to support TURN for guestsMatthew Hodgson2017-03-151-4/+34
| * | Merge pull request #1961 from benhylau/patch-1Erik Johnston2017-03-311-3/+3
| |\ \
| | * | Clarify doc for SQLite to PostgreSQL portBenedict Lau2017-03-011-3/+3
| * | | Fix the logcontext handling in the cache wrappers (#2077)Richard van der Hoff2017-03-301-3/+8
* | | | Add a brief list of commands to docsErik Johnston2017-03-311-0/+46
* | | | Fix up docsErik Johnston2017-03-311-8/+8
* | | | Fix indentation in docs/Erik Johnston2017-03-301-25/+28
* | | | Initial TCP protocol implementationErik Johnston2017-03-301-0/+174
|/ / /
* | | log_contexts.rst: fix formatting of Note blockRichard van der Hoff2017-03-201-6/+6
* | | log_contexts.rst: fix typosRichard van der Hoff2017-03-181-2/+2
* | | Logcontext docsRichard van der Hoff2017-03-171-8/+439
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-02-201-11/+21
|\|