Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

f50c4346

Commit f50c4346 authored 9 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into markjh/v2_sync_api

parents cacf0688 47427458

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

demo/start.sh 3 additions, 0 deletions

demo/start.sh
synapse/app/homeserver.py 2 additions, 4 deletions

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

synapse/config/logger.py
synapse/storage/__init__.py 0 additions, 375 deletions

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

synapse/storage/engines/postgres.py
synapse/storage/engines/sqlite3.py 3 additions, 1 deletion

synapse/storage/engines/sqlite3.py
synapse/storage/prepare_database.py 395 additions, 0 deletions

synapse/storage/prepare_database.py
synapse/util/debug.py 72 additions, 0 deletions

synapse/util/debug.py
tests/utils.py 1 addition, 1 deletion

tests/utils.py

with 485 additions and 382 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