Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2019-05-24 10:22:14 +01:00
43 changed files with 442 additions and 421 deletions

View File

@@ -46,7 +46,7 @@ var stubbedExpressApp = {
}
var adminApi = {
auth: {
needsPermission: function() {}
needsPermission: function() {return function(req,res,next) {next()}}
},
adminApp: stubbedExpressApp,
server: {}