Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev

4 years ago · 34134508cc
parent a6e154b5fe 17ebb399a6
commit 34134508cc
2 changed files with 9858 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@ -17,6 +17,7 @@
        "maatwebsite/excel": "^3.1",
        "nestedset/willaarts": "^5.0.7",
        "spatie/laravel-medialibrary": "^8.0.0",
+        "silber/bouncer": "v1.0.0-rc.10",
        "wm/blog": "dev-master",
        "wm/common": "dev-master",
        "wm/core": "dev-master",
--- a/composer.lock
+++ b/composer.lock