Update branch

Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
This commit is contained in:
cyril lopez 2017-12-06 15:59:26 +01:00
commit d995d4feef

View File

@ -165,7 +165,7 @@ const mountMiddlewares = function (files, cwd) {
loaded: false
};
if (endsWith(p, 'index.js')) {
if (endsWith(p, 'index.js') && !this.middleware[name].load) {
// Lazy loading.
Object.defineProperty(this.middleware[name], 'load', {
configurable: false,