Merge pull request #123 from silverstripe/feedback-update

Update to feedback module + core update
silverstripe · Feb 29, 2016 · 410bcd3 · 410bcd3
2 parents 87e74c1 + b51d808
commit 410bcd3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
 		"ext-gd": "*",
 		"ext-mbstring": "*",
 		"silverstripe/docsviewer": "^1.2",
-		"silverstripe/framework": "^3.2",
+		"silverstripe/framework": "3.2.1",
 		"silverstripe/toolbar": "^4.0",
 		"silverstripe/dynamodb": "^1.1",
 		"mandrew/silverstripe-quickfeedback": "^0.2"

diff --git a/composer.lock b/composer.lock