Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-08 12:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
754 Commits 5 Branches 705 Tags 114 MiB
7fc84c7019
Commit Graph

2 Commits

Author SHA1 Message Date
Erik Johnston
b50ea730b1 Merge branch 'develop' of github.com:matrix-org/synapse into develop 
Conflicts:
	synapse/http/server.py
        synapse/http/content_repository.py
 2014-09-03 12:01:14 +01:00
Mark Haines
bf10cf5f1a move contentrepo class to it's own file 2014-09-03 11:10:44 +01:00