anonymousland-synapse/synapse/handlers
David Baker c291a4d522 Merge branch 'develop' into pushers
Conflicts:
	synapse/handlers/events.py
	synapse/server.py
2015-01-28 12:51:05 +00:00
..
__init__.py Update copyright notices 2015-01-06 13:21:39 +00:00
_base.py Replace hs.parse_userid with UserID.from_string 2015-01-23 11:47:15 +00:00
admin.py Update copyright notices 2015-01-06 13:21:39 +00:00
directory.py Replace hs.parse_roomalias with RoomAlias.from_string 2015-01-23 13:21:58 +00:00
events.py Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
federation.py Replace hs.parse_userid with UserID.from_string 2015-01-23 11:47:15 +00:00
login.py Update copyright notices 2015-01-06 13:21:39 +00:00
message.py Pass the current time to serialize event, rather than passing an 2015-01-26 16:11:28 +00:00
presence.py Merge branch 'develop' into pushers 2015-01-28 12:51:05 +00:00
profile.py Replace hs.parse_userid with UserID.from_string 2015-01-23 11:47:15 +00:00
register.py Update copyright notices 2015-01-06 13:21:39 +00:00
room.py Pass the current time to serialize event, rather than passing an 2015-01-26 16:11:28 +00:00
typing.py Replace hs.parse_userid with UserID.from_string 2015-01-23 11:47:15 +00:00