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

Conflicts:
	tests/handlers/test_profile.py

2014-09-18 14:31:47 +01:00

4.4 KiB

Raw Blame History

View Raw