Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

332b60ec

Commit 332b60ec authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

Merge branch 'master' of github.com:matrix-org/synapse into develop

parents d42c81d7 83193a93

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.github/ISSUE_TEMPLATE/BUG_REPORT.md 6 additions, 6 deletions

.github/ISSUE_TEMPLATE/BUG_REPORT.md
INSTALL.md 6 additions, 2 deletions

INSTALL.md
README.rst 69 additions, 146 deletions

README.rst
changelog.d/4832.misc 1 addition, 0 deletions

changelog.d/4832.misc
docs/federate.md 125 additions, 0 deletions

docs/federate.md

with 207 additions and 154 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment