Skip to content
Snippets Groups Projects
Commit 335e5d13 authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop

Conflicts:
	tests/handlers/test_profile.py
parents 704e7e9f 4571cf7b
No related branches found
No related tags found
No related merge requests found
Showing
with 882 additions and 298 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 to comment