Merge branch 'dev'

Conflicts:
	composer.json
This commit is contained in:
Dave Olsen 2016-07-03 21:35:44 -04:00
commit e658fe349f

View File

@ -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"