Merge branch 'master' into redpine_rebase2
commit792090e37f785d98349a739c09402c16c525c399
authorMichael Keller <github@ike.ch>
Wed, 18 Mar 2020 10:46:02 +0000 (18 23:46 +1300)
committerGitHub <noreply@github.com>
Wed, 18 Mar 2020 10:46:02 +0000 (18 23:46 +1300)
treefc90ec86dfb39a59f8744f612f7943211739bf97
parent97c8952921f2bfb2863da180af5abbe49d9f1f60
parent95e40876414481eaf44110f64bae314d89f3e848
Merge branch 'master' into redpine_rebase2
src/main/cli/settings.c