Merge branch 'testing-modules' into dev

2016-01-21 11:33:52 +01:00
parent 9b18c2c966 5340d844bc
commit 718adb652b
28 changed files with 267 additions and 52 deletions
@@ -147,6 +147,7 @@ return [
        Illuminate\Translation\TranslationServiceProvider::class,
        Illuminate\Validation\ValidationServiceProvider::class,
        Illuminate\View\ViewServiceProvider::class,
+        Pingpong\Modules\ModulesServiceProvider::class,

        /*
         * Application Service Providers...