Merge branch 'dev'

dmolsen · dmolsen · commit 55f956ee5a13 · 2015-03-06T21:19:20.000-05:00
diff --git a/composer.json b/composer.json
@@ -32,6 +32,8 @@
 			"config": [
 				{ 
 					"patternExtension": "twig",
+					"lineageMatch": "{%([ ]+)?include [\"\']([A-Za-z0-9-_]+)[\"\'](.*)%}",
+					"lineageMatchKey": 2,
 					"twigDebug": false,
 					"twigDefaultDateFormat": "",
 					"twigDefaultIntervalFormat": "",

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`"config": [`
`33`	`33`	`{`
`34`	`34`	`"patternExtension": "twig",`
	`35`	`+ "lineageMatch": "{%([ ]+)?include [\"\']([A-Za-z0-9-_]+)[\"\'](.*)%}",`
	`36`	`+ "lineageMatchKey": 2,`
`35`	`37`	`"twigDebug": false,`
`36`	`38`	`"twigDefaultDateFormat": "",`
`37`	`39`	`"twigDefaultIntervalFormat": "",`