Merge branch 'subscribers' into form_widget

This commit is contained in:
Jonathan Labreuille
2015-08-21 10:39:06 +02:00
4 changed files with 2978 additions and 2982 deletions

View File

@@ -34,7 +34,7 @@ config.push(_.extend({}, baseConfig, {
entry: {
vendor: ['handlebars', 'handlebars_helpers'],
mailpoet: ['mailpoet', 'ajax', 'modal', 'notice'],
admin: ['settings.jsx']
admin: ['settings.jsx', 'subscribers.jsx']
},
plugins: [
new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.js'),
@@ -74,4 +74,4 @@ config.push(_.extend({}, baseConfig, {
}
}));
module.exports = config;
module.exports = config;