Mark Haines 3186c5bdbc Merge branch 'develop' into client_v2_sync		2015-01-26 16:32:40 +00:00
..
__init__.py	…
_base.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
admin.py	…
directory.py	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
events.py	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +00:00
federation.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
login.py	…
message.py	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +00:00
presence.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
profile.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00
register.py	…
room.py	Pass the current time to serialize event, rather than passing an	2015-01-26 16:11:28 +00:00
sync.py	Add handler for /sync API	2015-01-26 15:46:31 +00:00
typing.py	Replace hs.parse_userid with UserID.from_string	2015-01-23 11:47:15 +00:00