l10n daemon script afa869e11e 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"		2022-09-03 01:44:14 +00:00
..
images	Move theme images from bin/themes to themes after incorrect merge	2018-01-24 12:15:47 +01:00
main.css	Remove the padding of the bookmark bar	2019-07-13 17:45:31 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-03 01:44:14 +00:00
rtl.css	Fix theme issues with RTL	2018-01-11 19:44:20 +01:00
theme.png	Move themes to root source directory + remove bin directory	2017-09-26 10:49:39 +02:00