Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-04 02:37:14 +00:00
Code Releases Activity

resolve conflicts with current master v11.1.1

Browse Source 
Former-commit-id: 659ff392e889f3a8552d7da3d44848f1a364f7b2
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-07-23 19:20:07 +03:00
parent 79539b0055 85b1f6fc24
commit 736709aa75
41 changed files with 406 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
view/html.go
View File

@@ -92,7 +92,7 @@ func (s *HTMLEngine) Binary(assetFn func(name string) ([]byte, error), namesFn f
return s
}
// Reload if setted to true the templates are reloading on each render,
// Reload if set to true the templates are reloading on each render,
// use it when you're in development and you're boring of restarting
// the whole app when you edit a template file.
//
@@ -226,7 +226,7 @@ func (s *HTMLEngine) Load() error {
if err != nil {
return err
}
// change the directory field configuration, load happens after directory has been setted, so we will not have any problems here.
// change the directory field configuration, load happens after directory has been set, so we will not have any problems here.
s.directory = dir
return s.loadDirectory()
}