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
@@ -12,7 +12,8 @@
    "laravel/framework": "5.2.*",
    "phpmailer/phpmailer": "^5.2",
    "pingpong/modules": "~2.0",
-    "league/flysystem": "^1.0"
+    "league/flysystem": "^1.0",
+    "pingpong/menus": "^2.2"
  },
  "require-dev": {
    "fzaninotto/faker": "~1.4",