tests/utils.py · 10ef8e6e4bb9d50fd2c636cfbb66d3dd6d6f94e9 · Maunium / synapse · GitLab

Snippets Groups Projects

10 years ago
9605593d
Merge branch 'develop' into server2server_signing · 9605593d
Mark Haines authored 10 years ago
```
Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py
```
9605593d

History
Merge branch 'develop' into server2server_signing
Mark Haines authored 10 years ago
```
Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py
```