summary refs log tree commit diff
path: root/synapse/rest/client/v1/pusher.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Oops, bad merge: needed to change the base class of the rest servlets too.David Baker2015-01-281-2/+2
|
* Merge branch 'develop' into pushersDavid Baker2015-01-221-0/+80
Conflicts: synapse/rest/__init__.py