squash merge from dev branch

This commit is contained in:
Steve Brunton
2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions

View File

@@ -0,0 +1,2 @@
{{define "x"}}TEXT{{end}}
{{define "dotV"}}{{.V}}{{end}}

View File

@@ -0,0 +1,2 @@
{{define "dot"}}{{.}}{{end}}
{{define "nested"}}{{template "dot" .}}{{end}}

View File

@@ -0,0 +1,3 @@
template1
{{define "x"}}x{{end}}
{{template "y"}}

View File

@@ -0,0 +1,3 @@
template2
{{define "y"}}y{{end}}
{{template "x"}}