Erik Johnston
|
4ebbaf0d43
|
Blunty replace json with simplejson
|
2015-02-11 14:23:10 +00:00 |
|
Mark Haines
|
b085fac735
|
Code-style fixes
|
2015-02-10 16:30:48 +00:00 |
|
David Baker
|
dc7bb70f22
|
s/instance_handle/profile_tag/
|
2015-02-03 16:51:07 +00:00 |
|
David Baker
|
e0d2c6889b
|
Allow kind to be set to null to delete a pusher.
|
2015-01-29 17:05:00 +00:00 |
|
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +00:00 |
|
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
|
David Baker
|
5c6189ea3e
|
Merge branch 'develop' into pushers
Conflicts:
synapse/rest/__init__.py
|
2015-01-22 17:46:16 +00:00 |