Daniel Schiavini 4bffa6d90f Revert "fix merge conflict" ... This reverts commit ec03b012a7, reversing changes made to 2af33738d1.		2018-12-07 10:22:32 +01:00
..
ApplicationMenu.qml	Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict.	2018-11-11 12:44:56 +01:00
MainWindowHeader.qml	Revert "fix merge conflict"	2018-12-07 10:22:32 +01:00