Daniel Wagner-Hall 7e90fb6a57 Merge branch 'develop' into daniel/roomcleanupincremental ...

Conflicts:
	synapse/rest/client/v1/room.py

2016-02-17 15:53:59 +00:00

..

__init__.py

copyrights

2016-01-07 04:26:29 +00:00

admin.py

Revert "Reject additional path segments"

2016-02-09 12:46:52 +00:00

base.py

copyrights

2016-01-07 04:26:29 +00:00

directory.py

Introduce a Requester object

2016-01-11 17:48:45 +00:00

events.py

Allow non-guests to peek on rooms using /events

2016-01-20 15:34:07 +00:00

initial_sync.py

Introduce a Requester object

2016-01-11 17:48:45 +00:00

login.py

Catch the exceptions thrown by twisted when you write to a closed connection

2016-02-12 13:46:59 +00:00

presence.py

Revert "Reject additional path segments"

2016-02-09 12:46:52 +00:00

profile.py

Revert "Reject additional path segments"

2016-02-09 12:46:52 +00:00

push_rule.py

Fix typo in request validation for adding push rules.

2016-02-16 18:00:30 +00:00

pusher.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

register.py

Rename config field to reflect yaml name

2016-02-03 14:42:01 +00:00

room.py

Merge branch 'develop' into daniel/roomcleanupincremental

2016-02-17 15:53:59 +00:00

transactions.py

copyrights

2016-01-07 04:26:29 +00:00

voip.py

Introduce a Requester object

2016-01-11 17:48:45 +00:00