Commit Graph

4 Commits (d9d6fbb0856f87ee7d27ae1eb7d8bec9b21338cf)

Author SHA1 Message Date
Erik Johnston 47519cd8c2 Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py
2014-08-27 14:13:06 +01:00
Paul "LeoNerd" Evans dddf5c0cc8 git ignore all the homeserver*.db files 2014-08-27 13:08:55 +01:00
Erik Johnston 3a2a5b959c WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model. 2014-08-26 18:57:46 +01:00
Paul "LeoNerd" Evans 31ac288eb7 Capture the .gitignore file 2014-08-12 16:42:43 +01:00