Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Sat, 18 May 2019 21:07:34 +0000 (23:07 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Sat, 18 May 2019 21:07:34 +0000 (23:07 +0200)
commit876f69dc7d06eaaf8e0c52a96dc3d8317bb041be
tree0c6dc20772aceb92629856d777ab8e15ff8578d3
parent33605d7f655dfe2f9e171a9b701592ff38c558a9
parent492fc846df79f51e40761392ab082df78874d006
Merge branch 'master' into ivan/encryption-initial-setup