Luke Barnard d690677bde Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality ... Conflicts: src/components/views/elements/MemberEventListSummary.js		2017-01-24 14:17:11 +00:00
..
avatars	Add read receipt times to the hovertip of read markers	2016-12-08 16:23:20 +00:00
create_room	update copyright for 2016	2016-01-07 04:06:52 +00:00
dialogs	s/block/blacklist for e2e	2016-11-29 18:48:43 +00:00
elements	Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality	2017-01-24 14:17:11 +00:00
login	improve captcha warning	2016-12-24 18:40:20 +00:00
messages	Fix scroll jumping when a video is decrypted	2016-12-20 12:33:07 +00:00
room_settings	fix race between setting canonical alias and creating aliases	2016-09-16 18:01:14 +01:00
rooms	Unbranded error messages	2016-12-21 14:28:01 -08:00
settings	Interactive auth for device delete	2016-10-12 08:23:08 +01:00
voip	Added incomingCallBox to header and removed from roomTile	2016-09-15 14:39:34 +01:00