GitLab

(cherry picked from commit 91bee7ca)

(cherry picked from commit e65f6bec)

(cherry picked from commit dff0cae3)

(cherry picked from commit fd75fb17)

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"

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"

(cherry picked from commit 5279af7b)

(cherry picked from commit b3dfc8f5)

(cherry picked from commit 84a5cd9c)

GIT_SILENT manually merge release versions from release/19.12 branch, in future this will be cherry picked along with the branch commit

GIT_SILENT