Merge branch 'dev'

dmolsen · dmolsen · commit e658fe349fac · 2016-07-03T21:35:44.000-04:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
 		}
 	},
 	"require": {
-		"php": ">=5.3.6",
+		"php": ">=5.4",
 		"pattern-lab/core": "^2.0.0",
 		"pattern-lab/patternengine-twig": "^2.0.0",
 		"pattern-lab/styleguidekit-twig-default": "^2.0.0"

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`}`
`25`	`25`	`},`
`26`	`26`	`"require": {`
`27`		`- "php": ">=5.3.6",`
	`27`	`+ "php": ">=5.4",`
`28`	`28`	`"pattern-lab/core": "^2.0.0",`
`29`	`29`	`"pattern-lab/patternengine-twig": "^2.0.0",`
`30`	`30`	`"pattern-lab/styleguidekit-twig-default": "^2.0.0"`