Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions
--- a/vendor/barryvdh/laravel-debugbar/composer.json
+++ b/vendor/barryvdh/laravel-debugbar/composer.json
@@ -13,7 +13,7 @@
        "php": ">=5.5.9",
        "illuminate/support": "5.1.*|5.2.*|5.3.*",
        "symfony/finder": "~2.7|~3.0",
-        "maximebf/debugbar": "~1.11.0|~1.12.0"
+        "maximebf/debugbar": "~1.13.0"
    },
    "autoload": {
        "psr-4": {
@@ -25,7 +25,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.2-dev"
+            "dev-master": "2.3-dev"
        }
    }
 }