Kegan Dougal 0465323ca6 Merge branch 'develop' into kegan/invite-search		2016-01-18 17:31:26 +00:00
..
avatars	Fold BaseAvatar state mainly into state.urls to avoid too many code paths.	2016-01-15 17:05:05 +00:00
create_room	update copyright for 2016	2016-01-07 04:06:52 +00:00
dialogs	Created TextInputDialog	2016-01-13 16:32:41 +01:00
elements	merge develop	2016-01-18 14:02:19 +00:00
login	Merge branch 'develop' into push-rules-settings	2016-01-18 18:00:41 +01:00
messages	WIP all new roomsettings	2016-01-13 13:15:13 +00:00
rooms	Merge branch 'develop' into kegan/invite-search	2016-01-18 17:31:26 +00:00
settings	Make RoomAvatar use BaseAvatar	2016-01-15 16:13:25 +00:00
voip	s/function/func/ in PropTypes declarations	2016-01-12 13:11:53 +00:00