Merge remote-tracking branch 'origin/master'

Umisoft · Dec 26, 2013 · 6a11ed7 · 6a11ed7
2 parents 7a88afb + a33431d
commit 6a11ed7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -9,6 +9,6 @@
         }
     },
     "require": {
-        "umi/framework": "dev-master"
+        "umi/framework": "~1.0.0@RC"
     }
 }