Merge branch 'dev'

dmolsen · dmolsen · commit 1b888bf1fa64 · 2015-03-07T13:22:47.000-05:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -24,8 +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"
+		"pattern-lab/core": "0.*",
+		"pattern-lab/patternengine-twig": "0.*",
+		"pattern-lab/styleguidekit-assets-default": "0.*"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +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",`
`29`		`- "pattern-lab/styleguidekit-assets-default": "~0.5"`
	`27`	`+ "pattern-lab/core": "0.*",`
	`28`	`+ "pattern-lab/patternengine-twig": "0.*",`
	`29`	`+ "pattern-lab/styleguidekit-assets-default": "0.*"`
`30`	`30`	`}`
`31`	`31`	`}`