Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

74c1e161

Commit 74c1e161 authored 5 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 09a135b0 d7915192

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.buildkite/postgres-config.yaml 2 additions, 0 deletions

.buildkite/postgres-config.yaml
.buildkite/scripts/create_postgres_db.py 36 additions, 0 deletions

.buildkite/scripts/create_postgres_db.py
.buildkite/scripts/test_synapse_port_db.sh 11 additions, 4 deletions

.buildkite/scripts/test_synapse_port_db.sh
.buildkite/sqlite-config.yaml 2 additions, 0 deletions

.buildkite/sqlite-config.yaml
AUTHORS.rst 6 additions, 35 deletions

AUTHORS.rst
CHANGES.md 18 additions, 7 deletions

CHANGES.md
CONTRIBUTING.rst 0 additions, 11 deletions

CONTRIBUTING.rst
UPGRADE.rst 12 additions, 2 deletions

UPGRADE.rst
changelog.d/6276.misc 1 addition, 1 deletion

changelog.d/6276.misc
changelog.d/6279.misc 1 addition, 0 deletions

changelog.d/6279.misc
changelog.d/6286.bugfix 0 additions, 1 deletion

changelog.d/6286.bugfix
debian/changelog 6 additions, 0 deletions

debian/changelog
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py

with 96 additions and 62 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