Merge branch 'release/0.13.0'

bearsunday · Sep 30, 2014 · 3caa3bd · 3caa3bd
2 parents 7cb3b8e + 5968728
commit 3caa3bd
Show file tree

Hide file tree

Showing 6 changed files with 688 additions and 264 deletions.
diff --git a/composer.json b/composer.json
@@ -19,17 +19,17 @@
         }
     ],
     "provide": {
-        "bear/framework": "0.12.0"
+        "bear/framework": "0.13.0"
     },
     "require": {
         "php": ">=5.4.0",
         "bear/sunday": "~0.10",
 
         "aura/input": "~1.0",
-        "aura/html": "2.0.0-beta1",
+        "aura/html": "2.0",
         "aura/view": "~1.0",
-        "aura/router": "~2.0@dev",
-        "aura/web": "dev-develop-2",
+        "aura/router": "~2.0",
+        "aura/web": "~2.0.0-beta1",
         "aura/sql": "~2.0",
         "aura/session": "~1.0",
         "doctrine/dbal": "~2.0",