Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bf4fd148

Commit bf4fd148 authored 6 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'master' into develop

parents b02465b9 f830a3be

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 10 additions, 0 deletions

CHANGES.md
debian/changelog 6 additions, 0 deletions

debian/changelog
docker/Dockerfile-dhvirtualenv 5 additions, 1 deletion

docker/Dockerfile-dhvirtualenv
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/app/homeserver.py 13 additions, 6 deletions

synapse/app/homeserver.py
synapse/config/logger.py 2 additions, 0 deletions

synapse/config/logger.py

with 37 additions and 8 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