Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan.cukic@kde.org>
Sat, 11 May 2019 05:15:55 +0000 (07:15 +0200)
committerIvan Čukić <ivan.cukic@kde.org>
Sat, 11 May 2019 17:19:00 +0000 (19:19 +0200)
commitdb7e5e01b32ab405983cdd2cda4b4e745d2bdfca
tree2e834e3147814c4626fb0134136a8ec78e33dda4
parent7af786fde911c1a28d649f5ec2c1f9d6e966f1b2
parentae0b1ce3d6bae9fa4a7f1e0a6b795a32a49be641
Merge branch 'master' into ivan/encryption-initial-setup