Merge branch 'dev'

Author: dmolsen

composer.json

@@ -30,21 +30,19 @@
 	},
 	"extra": {
 		"patternlab": {
-			"config": [
-				{ 
-					"lineageMatch": "{%([ ]+)?include ["\\']([A-Za-z0-9-_]+)["\\'](.*)%}",
-					"lineageMatchKey": 2,
-					"patternExtension": "twig",
-					"twigDebug": false,
-					"twigDefaultDateFormat": "",
-					"twigDefaultIntervalFormat": "",
-					"twigMacroExt": "macro.twig",
-					"twigFilterExt": "filter.php",
-					"twigFunctionExt": "function.php",
-					"twigTagExt": "tag.php",
-					"twigTestExt": "test.php"
-				}
-			]
+			"config": { 
+				"lineageMatch": "{%([ ]+)?include ["\\']([A-Za-z0-9-_]+)["\\'](.*)%}",
+				"lineageMatchKey": 2,
+				"patternExtension": "twig",
+				"twigDebug": false,
+				"twigDefaultDateFormat": "",
+				"twigDefaultIntervalFormat": "",
+				"twigMacroExt": "macro.twig",
+				"twigFilterExt": "filter.php",
+				"twigFunctionExt": "function.php",
+				"twigTagExt": "tag.php",
+				"twigTestExt": "test.php"
+			}
 		}
 	}
 }