2 commits

Author	SHA1	Message	Date
l10n daemon script	b58419fb50	SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2018-06-07 05:47:03 +02:00
Marco Martin	da77551aff	merge quicksettings and the panel ... use plasmoids	2017-09-14 21:03:56 +02:00

Renamed from containments/panel/metadata.desktop (Browse further)