Merge branch 'develop' of github.com:portainer/portainer into develop

2018-07-06 12:15:10 +02:00 · 2018-07-06 12:15:10 +02:00 · 85d50d7566
parent 2ad7ca969f 7acaf4b35a
commit 85d50d7566
1 changed files with 1 additions and 1 deletions
--- a/api/cli/defaults_windows.go
+++ b/api/cli/defaults_windows.go
@ -15,5 +15,5 @@ const (
 	defaultSSLCertPath     = "C:\\certs\\portainer.crt"
 	defaultSSLKeyPath      = "C:\\certs\\portainer.key"
 	defaultSyncInterval    = "60s"
-	defaultTemplateFile    = "C:\\templates.json"
+	defaultTemplateFile    = "/templates.json"
 )