Merge branch 'dev'

dmolsen · dmolsen · commit 566b5d46188e · 2015-03-02T09:04:50.000-05:00
Conflicts:
	composer.json
diff --git a/composer.json b/composer.json
@@ -36,8 +36,8 @@
 		"symfony/event-dispatcher": "~2.5",
 		"symfony/filesystem": "~2.5",
 		"symfony/finder": "~2.5",
-		"kevinlebrun/colors.php": "0.*",
-		"pattern-lab/unified-asset-installer": "~0.5",
+		"kevinlebrun/colors.php": "~0.4",
+		"pattern-lab/unified-asset-installer": "dev-dev",
 		"alchemy/zippy": "~0.2.1"
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`"symfony/event-dispatcher": "~2.5",`
`37`	`37`	`"symfony/filesystem": "~2.5",`
`38`	`38`	`"symfony/finder": "~2.5",`
`39`		`- "kevinlebrun/colors.php": "0.*",`
`40`		`- "pattern-lab/unified-asset-installer": "~0.5",`
	`39`	`+ "kevinlebrun/colors.php": "~0.4",`
	`40`	`+ "pattern-lab/unified-asset-installer": "dev-dev",`
`41`	`41`	`"alchemy/zippy": "~0.2.1"`
`42`	`42`	`}`
`43`	`43`	`}`