upstream sync

2018-05-03 07:55:09 +02:00
parent 99c10b75fb
commit 50a6362b67
26 changed files with 530 additions and 172 deletions
--- a/config.dev.toml
+++ b/config.dev.toml
@@ -37,6 +37,7 @@ db = 0
 pass = "3rdaP3KL2x%V"
 prefix = "nemt-portal-api-dev"
 default-expiration = "5m"
+master-name = "devmaster01"

 [log]
 log-to-file = false