6 Commits

Author SHA1 Message Date
Aurelsicoko
51d936b559 Resolve conflicts 2017-09-25 18:28:45 +02:00
Aurelsicoko
b8accc03b9 Use React and React-DOM through global to use the exact same dependency everywhere 2017-09-22 16:56:09 +02:00
Aurelsicoko
9ef6618f3a Run test on port 1338 and remove deprecated PropTypes warning 2017-09-20 11:12:04 +02:00
cyril lopez
7c6a3f4687 Fix conflict 2017-09-14 15:10:08 +02:00
Aurelsicoko
be4c757f5a Use bindActionCreators, solve i18n issues 2017-09-14 11:10:05 +02:00
Pierre Burgy
9caf5b8203 Move admin files in strapi-admin folder 2017-08-22 18:29:02 +02:00