~trebelnik-stefina/cinnamon-test/+git/k3b:release/20.12

Last commit made on 2021-03-02
Get this branch:
git clone -b release/20.12 https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/k3b

Branch merges

Branch information

Name:
release/20.12
Repository:
lp:~trebelnik-stefina/cinnamon-test/+git/k3b

Recent commits

e5cd78e... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

9600a5b... by Heiko Becker <email address hidden>

GIT_SILENT Update Appstream for new release

2509d15... by Heiko Becker <email address hidden>

GIT_SILENT Upgrade release service version to 20.12.3.

35d9b7e... by Heiko Becker <email address hidden>

GIT_SILENT Update Appstream for new release

2974169... by Heiko Becker <email address hidden>

GIT_SILENT Upgrade release service version to 20.12.2.

38f5449... by Luboš Doležel

Large directories were not being added to data projects with all their contents

(cherry picked from commit c192e429bfadf597e45d04dade227a09670af6f7)

cf88db9... by Christoph Feck <email address hidden>

GIT_SILENT Update Appstream for new release

8599d24... by Christoph Feck <email address hidden>

GIT_SILENT Upgrade release service version to 20.12.1.

3b116cb... by l10n daemon script <email address hidden>

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"

668a85e... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)