Merge branch 'develop'

formers · Aug 3, 2014 · d5bbb27 · d5bbb27
2 parents 7fcd429 + e5e898e
commit d5bbb27
Show file tree

Hide file tree

Showing 22 changed files with 375 additions and 298 deletions.
diff --git a/composer.json b/composer.json
@@ -16,18 +16,19 @@
     }
   ],
   "require": {
+		"php": ">=5.3.0",
     "anahkiasen/html-object": "~1.4",
-    "illuminate/config": "~4.0",
-    "illuminate/container": "~4.0",
-    "illuminate/http": "~4.0",
-    "illuminate/routing": "~4.0",
-    "illuminate/session": "~4.0",
-    "illuminate/translation" :"~4.0"
+    "illuminate/config": "4.1.*",
+    "illuminate/container": "4.1.*",
+    "illuminate/http": "4.1.*",
+    "illuminate/routing": "4.1.*",
+    "illuminate/session": "4.1.*",
+    "illuminate/translation" :"4.1.*"
   },
   "require-dev": {
 		"phpunit/phpunit": "~4.1.4",
     "mockery/mockery": "~0.9.1",
-    "illuminate/database": "~4.0"
+    "illuminate/database": "4.1.*"
   },
   "autoload": {
     "psr-4": {