Merge in latest master

This commit is contained in:
Age Manning
2019-11-29 13:23:03 +11:00
14 changed files with 490 additions and 109 deletions

View File

@@ -282,7 +282,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
.short("m")
.value_name("MINUTES")
.required(true)
.default_value("0")
.default_value("30")
.help("The maximum number of minutes that will have elapsed before genesis"))
)
/*