Daniel Schiavini 4bffa6d90f Revert "fix merge conflict" ... This reverts commit ec03b012a7, reversing changes made to 2af33738d1.		2018-12-07 10:22:32 +01:00
..
png	Rename printer images	2018-11-27 11:19:30 +01:00
qml	Revert "fix merge conflict"	2018-12-07 10:22:32 +01:00
svg	Improve camera icon	2018-11-27 11:19:45 +01:00