Merge branch 'develop' of github.com:octobercms/october into develop

2014-06-27 21:40:42 +11:00 · 2014-06-27 21:40:42 +11:00 · 43dde06559
parent cfbfd8ce3e ebb92ed33e
commit 43dde06559
2 changed files with 4 additions and 1 deletions
--- a/app/storage/temp/.gitignore
+++ b/app/storage/temp/.gitignore
@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/composer.json
+++ b/composer.json
@ -56,5 +56,6 @@
    "config": {
        "preferred-install": "dist"
    },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }