Merge branch 'master' into stable

This commit is contained in:
Julien Fastré 2019-12-04 22:21:24 +01:00
commit 6417234609
3 changed files with 7 additions and 3 deletions

View File

@ -39,4 +39,5 @@ Version 1.5.9
=============
- better exception description when task workflow is not found ;
- load webpack config using a `configure` function ;

View File

@ -0,0 +1,3 @@
// this file loads all assets from the Chill task bundle
require('./sass/_task.scss');

View File

@ -1,3 +1,3 @@
// this file loads all assets from the Chill task bundle
require('./Resources/public/sass/_task.scss');
module.exports = function(encore, entries) {
entries.push(__dirname + '/Resources/public/index.js');
};