l10n daemon script e0ea9fd04c 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"		2020-02-12 06:06:11 +01:00
..
extensions.svg	Added HelloQml Extension	2018-10-02 03:07:32 +05:30
main.qml	Merge branch 'Falkon/3.1'	2019-04-20 12:10:35 +02:00
Messages.sh	i18n: use https for bugs.kde.org	2019-06-30 11:26:59 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-12 06:06:11 +01:00
script.js	Added HelloQml Extension	2018-10-02 03:07:32 +05:30