Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

724bb1e7

Commit 724bb1e7 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 1c791275 52f98f8a

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

AUTHORS.rst 3 additions, 0 deletions

AUTHORS.rst
CHANGES.rst 2 additions, 0 deletions

CHANGES.rst
UPGRADE.rst 1 addition, 1 deletion

UPGRADE.rst
docs/postgres.rst 3 additions, 3 deletions

docs/postgres.rst
scripts/port_from_sqlite_to_postgres.py 5 additions, 4 deletions

scripts/port_from_sqlite_to_postgres.py
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py

with 15 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