Merge branch 'master' into ivan/encryption-initial-setup
authorIvan Čukić <ivan-cukic@users.noreply.github.com>
Mon, 3 Jun 2019 07:11:56 +0000 (09:11 +0200)
committerGitHub <noreply@github.com>
Mon, 3 Jun 2019 07:11:56 +0000 (09:11 +0200)
commit200032c9cb4f971ffb0815e61e02b4bdd31f4a7e
tree6c25aa5f38b34dc2125bbf6ebfe838f44168c58d
parent876f69dc7d06eaaf8e0c52a96dc3d8317bb041be
parent6a294bb4a054960ee45fe175c1810d5125550834
Merge branch 'master' into ivan/encryption-initial-setup