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

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

Branch merges

Branch information

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

Recent commits

b09da4d... 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"

081e633... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

da585ae... 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"

1d0cac4... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

00a0ec0... 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"

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

GIT_SILENT made messages (after extraction)

22b4216... by Heiko Becker <email address hidden>

GIT_SILENT Update Appstream for new release

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

GIT_SILENT Upgrade release service version to 22.04.3.

e746b89... 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"

5f1c10a... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)