Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

58930da5

Commit 58930da5 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 70d650be 0870588c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.rst 8 additions, 0 deletions

CHANGES.rst
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/api/auth.py 10 additions, 5 deletions

synapse/api/auth.py
synapse/storage/engines/__init__.py 1 addition, 1 deletion

synapse/storage/engines/__init__.py
synapse/storage/engines/postgres.py 12 additions, 1 deletion

synapse/storage/engines/postgres.py
synapse/storage/engines/sqlite3.py 1 addition, 1 deletion

synapse/storage/engines/sqlite3.py

with 33 additions and 9 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