Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

fix typo in sample_config.yaml #7652

Merged
merged 5 commits into from
Jun 11, 2020
Merged

Conversation

wondratsch
Copy link
Contributor

Just a simple typo fix.

Signed-off-by: wondratsch 28294257+wondratsch@users.noreply.github.com

@erikjohnston
Copy link
Member

Thanks! When changing the config can you run the scripts-dev/generate_sample_config please? That's why CI is failing (I wish we could make things like that happen automatically in CI, but alas that's not easy)

@richvdh richvdh added the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jun 9, 2020
@erikjohnston erikjohnston self-assigned this Jun 11, 2020
@erikjohnston erikjohnston removed the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jun 11, 2020
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've replicated the change to the codebase so it will be included in later iterations of the sample config.

Thanks for catching!

@anoadragon453 anoadragon453 merged commit c746889 into matrix-org:develop Jun 11, 2020
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '03619324f':
  Create a ListenerConfig object (#7681)
  Fix changelog wording
  1.15.1
  Wrap register_device coroutine in an ensureDeferred (#7684)
  Ensure the body is a string before comparing push rules. (#7701)
  Ensure etag is a string for GET room_keys/version response (#7691)
  Update m.id.phone to use 'phone' instead of 'number' (#7687)
  Fix "There was no active span when trying to log." error (#7698)
  Enable 3PID add/bind/unbind endpoints on r0 routes
  Discard RDATA from already seen positions. (#7648)
  Replace iteritems/itervalues/iterkeys with native versions. (#7692)
  Fix warnings about losing log context during UI auth. (#7688)
  Fix a typo when comparing the URI & method during UI Auth. (#7689)
  Remove "user_id" from GET /presence. (#7606)
  Increase the default SAML session expirary time to 15 minutes. (#7664)
  fix typo in sample_config.yaml (#7652)
  Take out a lock before modifying _CACHES (#7663)
  Add option to enable encryption by default for new rooms (#7639)
  Clean-up the fallback login code. (#7657)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants