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

This commit is contained in:
Aurélien Georget 2016-11-24 17:37:11 +01:00
commit ad2b416333

View File

@ -1,4 +1,5 @@
{
"admin": "admin",
"favicon": {
"path": "favicon.ico",
"maxAge": 86400000,