Michael Telatynski 2eb715002f Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message ... Conflicts: .gitignore		2017-04-24 18:38:52 +01:00
..
context_menus	Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message	2017-04-24 18:38:52 +01:00
dialogs	More unmounted guards in BugReportDialog	2017-04-18 16:51:35 +01:00
directory	Allow mxc: URLs for icons in the NetworkDropdown	2017-02-02 19:35:36 +00:00
elements	make ImageView Download work, based on props.name	2017-04-17 15:07:21 +01:00
globals	Turned divs to button-likes to comply with MDN's recommendations	2017-01-14 02:11:58 +02:00
login	Cosmetics to go with matrix-org/matrix-react-sdk#811	2017-04-21 17:04:11 +01:00
messages	Updating timestamp format	2016-08-16 15:01:25 +01:00
rooms	show err.message in errors if present	2017-04-23 02:22:31 +01:00
settings	show err.message in errors if present	2017-04-23 02:22:31 +01:00