Pierre Burgy 40bb048072 Fix conflicts

2017-08-17 10:11:41 +02:00

..

assets/images

Remove baseline in admin

2017-08-14 11:49:29 +02:00

components

Adapt content management for admin changes

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

containers

Improve translations system

2017-08-14 15:22:42 +02:00

styles

Fix conflicts

2017-08-17 10:11:41 +02:00

translations

Admin improvements

2017-07-21 18:15:43 +02:00

utils

Remove tests folders

2017-08-14 11:41:59 +02:00

app.js

Improve left menu links system

2017-08-14 17:09:34 +02:00

favicon.ico

Separate strapi-generate-admin and strapi-admin packages

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

i18n.js

Use require for i18n

2017-08-16 19:27:56 +02:00

index.html

Separate strapi-generate-admin and strapi-admin packages

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

reducers.js

Separate strapi-generate-admin and strapi-admin packages

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

routes.js

Style admin left menu

2017-07-07 18:19:12 +02:00

store.js

Separate strapi-generate-admin and strapi-admin packages

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