Merge branch 'master' of github.com:ibrandcc/ecommerce-open-api

guojiangclub · Dec 26, 2018 · 1683bd2 · 1683bd2
2 parents 410efe4 + d538f66
commit 1683bd2
Show file tree

Hide file tree

Showing 14 changed files with 287 additions and 494 deletions.
diff --git a/composer.json b/composer.json
@@ -9,12 +9,11 @@
         "barryvdh/laravel-cors": "^0.10",
         "dingo/api": "2.0.0-alpha1",
         "fideloper/proxy": "~3.3",
-        "ibrand/backend": "2.0.2",
+        "ibrand/backend": "~3.0",
         "ibrand/laravel-miniprogram-poster": "^1.1",
         "ibrand/laravel-shopping-cart": "^1.3",
         "ibrand/laravel-sms": "~1.0",
         "ibrand/laravel-ueditor": "^1.0",
-        "encore/laravel-admin": "dev-ibrand as 1.6.7",
         "ibrand/setting": "^1.1",
         "lavary/laravel-menu": "~1.7",
         "laravelcollective/html": "^5.5",
@@ -106,10 +105,6 @@
         {
             "type": "composer",
             "url": "https://packagist.laravel-china.org"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/ibrandcc/laravel-admin"
         }
     ]
 }