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

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

Branch merges

Branch information

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

Recent commits

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

GIT_SILENT made messages (after extraction)

610953e... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

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

GIT_SILENT made messages (after extraction)

1808e50... by Heiko Becker <email address hidden>

GIT_SILENT Update Appstream for new release

5a0b5a4... by Heiko Becker <email address hidden>

GIT_SILENT Upgrade release service version to 21.08.3.

16f494b... 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"

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

GIT_SILENT made messages (after extraction)

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

GIT_SILENT Update Appstream for new release

91f27ad... by Heiko Becker <email address hidden>

GIT_SILENT Upgrade release service version to 21.08.2.

9eb38ba... 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"