kdeconnect-desktop:release/20.04

Last commit made on 2020-06-18
Get this branch:
git clone -b release/20.04 https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
release/20.04
Repository:
lp:kdeconnect-desktop

Recent commits

373557c... by l10n daemon script <email address hidden> on 2020-06-18

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"

dbc476e... by l10n daemon script <email address hidden> on 2020-06-18

GIT_SILENT made messages (after extraction)

5fe8d7e... by l10n daemon script <email address hidden> on 2020-06-17

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"

d48849d... by l10n daemon script <email address hidden> on 2020-06-17

GIT_SILENT made messages (after extraction)

ee34142... by l10n daemon script <email address hidden> on 2020-06-11

GIT_SILENT made messages (after extraction)

046a572... by l10n daemon script <email address hidden> on 2020-06-07

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"

b06162a... by l10n daemon script <email address hidden> on 2020-06-07

GIT_SILENT made messages (after extraction)

99f0428... by l10n daemon script <email address hidden> on 2020-06-03

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"

bc08ff7... by l10n daemon script <email address hidden> on 2020-05-31

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"

4df8dfc... by Nicolas Fella <email address hidden> on 2020-05-14

Fix findthisdevice sound URL