Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Tue, 14 May 2019 19:53:57 +0000 (21:53 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Tue, 14 May 2019 19:53:57 +0000 (21:53 +0200)
commita8ac89c20c616093554667388aa7cf400376d13a
tree4c0bb690f4efb0408fc63bd9679a973d1b7883b6
parent6c0d796b4bd69a79ad301ea349144bf6c0f80756
parente0f421ac7a6e8aac4002b7f1030e6610107a041a
Merge branch 'master' into ivan/encryption-initial-setup