Jim Laurie 51fb73c7a2 Fix conflict

2017-07-24 16:02:14 +02:00

..

config

Make build working

2017-05-17 11:21:03 +02:00

controllers

Use admin instead of public folder for plugins

2017-05-17 16:06:06 +02:00

public

Fix conflict

2017-07-24 16:02:14 +02:00

services

Make build working

2017-05-17 11:21:03 +02:00

package-lock.json

Resolve alpha.4 setup workflow

2017-07-17 16:48:09 +02:00

package.json

Separate strapi-generate-admin and strapi-admin packages

2017-05-11 17:30:00 +02:00