Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

47acbc51

Commit 47acbc51 authored 5 years ago by Brendan Abolivier

Downloads
- Plain Diff

Merge branch 'master' into develop

parents ba547ec3 d9239b52

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 11 additions, 3 deletions

CHANGES.md
debian/changelog 6 additions, 0 deletions

debian/changelog
docker/Dockerfile 1 addition, 1 deletion

docker/Dockerfile
docs/admin_api/user_admin_api.rst 2 additions, 1 deletion

docs/admin_api/user_admin_api.rst
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py

with 21 additions and 6 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