Merge branch 'admin' of github.com:strapi/strapi into admin

This commit is contained in:
Aurélien Georget 2016-11-24 17:36:46 +01:00
commit 2f08ed60ec

View File

@ -1,10 +1,10 @@
{
"static": true,
"views": false,
"websockets": true,
"favicon": {
"path": "favicon.ico",
"maxAge": 86400000
"maxAge": 86400000,
},
"prefix": ""
"prefix": "",
"static": true,
"views": false,
"websockets": true
}