Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b02465b9

Commit b02465b9 authored 6 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'master' into develop

parents c6e75c9f 00cf679b

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 3 additions, 3 deletions

CHANGES.md
changelog.d/4636.bugfix 0 additions, 1 deletion

changelog.d/4636.bugfix
debian/changelog 10 additions, 0 deletions

debian/changelog
debian/matrix-synapse.service 1 addition, 0 deletions

debian/matrix-synapse.service
docs/MSC1711_certificates_FAQ.md 1 addition, 1 deletion

docs/MSC1711_certificates_FAQ.md
synapse/__init__.py 2 additions, 2 deletions

synapse/__init__.py

with 17 additions and 7 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