.gitignore · 822d0e552037784c3183bdc928dca9e2705367c6 · Timo Ley / synapse · GitLab

Snippets Groups Projects

Forked from Maunium / synapse

Source project has a limited visibility.

10 years ago
47519cd8
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor · 47519cd8
Erik Johnston authored 10 years ago
```
Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py
```
47519cd8

History
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Erik Johnston authored 10 years ago
```
Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py
```