Luke Barnard e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus ... Conflicts: src/components/views/context_menus/RoomTagContextMenu.js		2017-03-14 14:01:47 +00:00
..
components	Merge branch 'develop' into luke/merge-RoomTile-context-menus	2017-03-14 14:01:47 +00:00
notifications	Change wording in notification description	2017-02-27 15:47:21 -07:00
skins/vector	Merge branch 'develop' into luke/merge-RoomTile-context-menus	2017-03-14 14:01:47 +00:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Merge pull request #3385 from vector-im/luke/fix-screen-after-login	2017-03-14 13:47:55 +00:00
VectorConferenceHandler.js	click on group call thumbnail should return you to the group call, not the 1:1	2016-04-12 02:27:35 +01:00
component-index.js	Merge the two RoomTile context menus into one	2017-03-09 17:05:51 +00:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00