Merge branch 'layout' into dev

2016-01-21 12:32:54 +01:00
parent a615b20ae8 2e8f42efe2
commit cad627a74e
10 changed files with 289 additions and 27 deletions
@@ -29,5 +29,6 @@ class AppServiceProvider extends ServiceProvider

        // register PingPong module extension
        $this->app->register('Pingpong\Modules\ModulesServiceProvider');
+        $this->app->register('Pingpong\Menus\MenusServiceProvider');
    }
 }