Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
|
Paul "LeoNerd" Evans
|
bb793019a5
|
Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server
|
2014-08-19 11:16:23 +01:00 |
|
Erik Johnston
|
dccb2f57be
|
Disable the ability to GET individualy messages. We need to think about the correct API to do this, as the current one doesn't make much sense.
|
2014-08-18 10:59:04 +01:00 |
|
Matthew Hodgson
|
3e35a9f96e
|
add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it
|
2014-08-13 03:32:18 +01:00 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |
|