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

Fix spelling in server notices admin API docs #5142

Merged
merged 2 commits into from
May 6, 2019
Merged

Conversation

turt2live
Copy link
Member

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

@turt2live turt2live requested a review from a team May 6, 2019 06:13
@turt2live
Copy link
Member Author

docs/sample_config.yaml is not up-to-date. Regenerate it with scripts-dev/generate_sample_config

I'm assuming this is not my problem to solve

Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

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

LGTM other than the failures which I no comprehend

@richvdh
Copy link
Member

richvdh commented May 6, 2019

docs/sample_config.yaml is not up-to-date. Regenerate it with scripts-dev/generate_sample_config

Oops, my bad for merging #5134 without waiting for the CI to complete :/. Fixed on develop.

@richvdh
Copy link
Member

richvdh commented May 6, 2019

Thanks @turt2live !

@richvdh richvdh merged commit 3fdff14 into develop May 6, 2019
@turt2live turt2live deleted the travis/spelling-1 branch May 6, 2019 21:32
anoadragon453 added a commit that referenced this pull request May 10, 2019
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...
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.

3 participants