David Baker
|
5c6189ea3e
|
Merge branch 'develop' into pushers
Conflicts:
synapse/rest/__init__.py
|
2015-01-22 17:46:16 +00:00 |
|
Mark Haines
|
d3d0713de5
|
Move experiments, graph and cmdclient into contrib
|
2015-01-22 11:57:54 +00:00 |
|
David Baker
|
0a6664493a
|
Merge branch 'master' into pushers
|
2014-12-18 15:06:11 +00:00 |
|
Paul "LeoNerd" Evans
|
d8b35250a5
|
Remove editor junk
|
2014-12-02 18:01:16 +00:00 |
|
David Baker
|
48f90036d8
|
Add non-working jitsi meet bridge
|
2014-12-02 18:01:16 +00:00 |
|
Matthew Hodgson
|
68cdcbdcab
|
fix IO::Async abuse - thanks leo
|
2014-12-02 18:01:16 +00:00 |
|
Matthew Hodgson
|
9f4abd59f5
|
ignore rogue matrix call events; support verto.media RPC as a horrible hack; fix NA::Matrix dep
|
2014-12-02 18:01:16 +00:00 |
|
Matthew Hodgson
|
72c1cc743e
|
clean up a vertobot a bit
|
2014-12-02 18:01:16 +00:00 |
|
Matthew Hodgson
|
0d149ae6e9
|
a simple matrix->verto bot, distantly related to the irc bridge
|
2014-12-02 18:01:16 +00:00 |
|
David Baker
|
bdc21e7282
|
convert to spaces before I start a holy war
|
2014-12-02 14:10:24 +00:00 |
|
David Baker
|
758052d7f8
|
Add non-working jitsi meet bridge
|
2014-12-02 12:01:30 +00:00 |
|
Matthew Hodgson
|
e43139ac5e
|
fix IO::Async abuse - thanks leo
|
2014-11-28 16:16:41 +00:00 |
|
Matthew Hodgson
|
08bf2aaab5
|
ignore rogue matrix call events; support verto.media RPC as a horrible hack; fix NA::Matrix dep
|
2014-11-28 14:43:28 +00:00 |
|
Matthew Hodgson
|
f7fb4675a6
|
clean up a vertobot a bit
|
2014-11-28 06:55:05 +00:00 |
|
Matthew Hodgson
|
76a2e92658
|
a simple matrix->verto bot, distantly related to the irc bridge
|
2014-11-28 06:45:10 +00:00 |