Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

b690542a

Commit b690542a authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'master' into develop

parents deff8f62 244bff4e

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 14 additions, 1 deletion

CHANGES.md
UPGRADE.rst 1 addition, 1 deletion

UPGRADE.rst
debian/changelog 6 additions, 0 deletions

debian/changelog
docker/Dockerfile 2 additions, 1 deletion

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

synapse/__init__.py
synapse/python_dependencies.py 4 additions, 0 deletions

synapse/python_dependencies.py

with 28 additions and 4 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