Merge branch 'dev'

dmolsen · dmolsen · commit eb329e36784b · 2015-03-07T10:34:53.000-05:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -24,6 +24,8 @@
 		"source":         "https://github.com/pattern-lab/styleguidekit-twig-default/releases"
 	},
 	"require": {
+		"pattern-lab/core": "~0.5",
+		"pattern-lab/patternengine-twig": "~0.5",
 		"pattern-lab/styleguidekit-assets-default": "~0.5"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`"source": "https://github.com/pattern-lab/styleguidekit-twig-default/releases"`
`25`	`25`	`},`
`26`	`26`	`"require": {`
	`27`	`+ "pattern-lab/core": "~0.5",`
	`28`	`+ "pattern-lab/patternengine-twig": "~0.5",`
`27`	`29`	`"pattern-lab/styleguidekit-assets-default": "~0.5"`
`28`	`30`	`}`
`29`	`31`	`}`