Richard Lewis 0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes		2017-08-17 17:47:46 +01:00
..
avatars	Change incorrect refs to this.props	2017-07-11 14:31:07 +01:00
create_room	Add more translations..	2017-06-08 09:44:58 +01:00
dialogs	Move non-invite specific stuff to UserAddress	2017-08-15 13:42:23 +01:00
elements	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00
login	Add misiing _tJsx import	2017-08-16 23:55:43 +02:00
messages	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics	2017-08-10 13:54:55 +01:00
room_settings	un-i18n Modal Analytics	2017-07-27 17:19:18 +01:00
rooms	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00
settings	hotfix bad fn signature regression	2017-08-17 17:15:18 +01:00
voip	de-lint views/voip/*	2017-07-01 14:58:46 +01:00