Jim Laurie b7712cf512 Fix conflicts

2017-12-07 17:04:24 +01:00

..

manifest.json

Fix conflicts

2017-12-07 17:04:24 +01:00

webpack.base.babel.js

Update path to use local strapi-helper-plugin

2017-11-17 16:05:47 +01:00

webpack.dev.babel.js

Fix babel-polyfill dependencies and improve email appearance

2017-12-05 12:10:08 +01:00

webpack.dll.babel.js

Fix babel-polyfill dependencies and improve email appearance

2017-12-05 12:10:08 +01:00

webpack.prod.babel.js

Fix babel-polyfill dependencies and improve email appearance

2017-12-05 12:10:08 +01:00

webpack.test.babel.js

Fix conflict

2017-09-14 15:10:08 +02:00