Merge branch 'zetetic-prerelease' into zetetic-master
commit7695ec9f32d2bea95f19380eee57951660409eb3
authorNick Parker <nparker@zetetic.net>
Wed, 20 Nov 2019 15:22:21 +0000 (20 09:22 -0600)
committerNick Parker <nparker@zetetic.net>
Wed, 20 Nov 2019 15:22:21 +0000 (20 09:22 -0600)
tree3aed395c8ac90f92eacd9959284311c8ef748e3a
parent750f5e32474ee23a423376203e671cab9841c67a
parent14dd199f683ededc5c0686fd52233addc3cfc989
Merge branch 'zetetic-prerelease' into zetetic-master