Miroslav Bajtoš d5cd0a3b50 Merge branch 'master' into 2.0 ... Conflicts: README.md docs/configuration.md lib/executor.js package.json Changes in the docs were merged manually and updated to correctly describe the 2.x layout.		2014-06-26 14:40:24 +02:00
..
bundler.js	Rework model configuration	2014-06-13 19:40:52 +02:00
compiler.js	Rename `app.json` to `config.json`	2014-06-25 08:18:04 +02:00
config-loader.js	Rename `app.json` to `config.json`	2014-06-25 08:18:04 +02:00
executor.js	Merge branch 'master' into 2.0	2014-06-26 14:40:24 +02:00