Merge branch 'dev'

dmolsen · dmolsen · commit 618da18eca8d · 2015-03-07T08:35:27.000-05:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Dave Olsen, http://dmolsen.com
+Copyright (c) 2014 Dave Olsen, http://dmolsen.com 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/composer.json b/composer.json
@@ -31,9 +31,9 @@
 		"patternlab": {
 			"config": [
 				{ 
-					"patternExtension": "twig",
-					"lineageMatch": "{%([ ]+)?include [\"\']([A-Za-z0-9-_]+)[\"\'](.*)%}",
+					"lineageMatch": "{%([ ]+)?include [&quot;\\&#039;]([A-Za-z0-9-_]+)[&quot;\\&#039;](.*)%}",
 					"lineageMatchKey": 2,
+					"patternExtension": "twig",
 					"twigDebug": false,
 					"twigDefaultDateFormat": "",
 					"twigDefaultIntervalFormat": "",
