tests/rest/test_profile.py · 820ef6e9d881c2194cb1de687fb49b85696fee00 · Maunium / synapse · GitLab

Snippets Groups Projects

10 years ago
347242a5
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor · 347242a5
Erik Johnston authored 10 years ago
```
Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py
```
347242a5

History
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Erik Johnston authored 10 years ago
```
Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py
```