Paul "LeoNerd" Evans 31a049eb69 Merge branch 'develop' into room-initial-sync ...

Conflicts:
	synapse/handlers/message.py

2014-11-17 16:59:24 +00:00

..

__init__.py

SYN-48: Implement WHOIS rest servlet

2014-09-29 14:59:52 +01:00

_base.py

Rename annotate_state_groups to annotate_event_with_state

2014-11-11 16:58:53 +00:00

admin.py

SYN-48: Implement WHOIS rest servlet

2014-09-29 14:59:52 +01:00

directory.py

Implement new replace_state and changed prev_state

2014-11-06 15:10:55 +00:00

events.py

Correctly handle the 'age' key in events and pdus

2014-09-15 13:26:11 +01:00

federation.py

These lines aren't doing anything

2014-11-17 10:41:35 +00:00

login.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

message.py

Merge branch 'develop' into room-initial-sync

2014-11-17 16:59:24 +00:00

presence.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

profile.py

Add an EventValidator. Fix bugs in auth ++ storage

2014-11-10 18:25:42 +00:00

register.py

Use python logger, not the twisted logger

2014-11-03 10:16:28 +00:00

room.py

SYN-148: Add the alias after creating the room

2014-11-17 16:37:33 +00:00

typing.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00