Merge branch 'release/0.12.0' into develop

bearsunday · May 20, 2014 · aad110c · aad110c
2 parents 550f2a2 + ab9d748
commit aad110c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     "require": {
         "php": ">=5.4.0",
         "aura/signal": "~1.0",
-        "ray/di": "~1.3@dev",
+        "ray/di": "~1.3",
         "doctrine/cache": "~1.3",
         "nocarrier/hal":"~0.9",
         "guzzlehttp/guzzle": "~4.0",

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