l10n daemon script cb3c12c6c9 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"		2023-10-27 03:08:58 +00:00
..
images	Move theme images from bin/themes to themes after incorrect merge	2018-01-24 12:15:47 +01:00
main.css	WebView: Add support for changing default background color	2018-02-24 18:00:53 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-10-27 03:08:58 +00:00
rtl.css	Fix last cases of wrong tab borders in Windows theme	2018-01-11 19:44:25 +01:00
theme.png	Update theme descriptions	2018-01-11 19:47:29 +01:00