Miroslav Bajtoš 0a0a6f5d01 Merge branch 'master' into 2.0 ... Conflicts: index.js package.json		2014-06-16 19:49:45 +02:00
..
bundler.js	Rework model configuration	2014-06-13 19:40:52 +02:00
compiler.js	compiler: Sort models topologically	2014-06-16 19:45:34 +02:00
config-loader.js	Load datasources and app cfg from multiple files	2014-05-27 14:08:58 +02:00
executor.js	Merge branch 'master' into 2.0	2014-06-16 19:49:45 +02:00