Merge branch 'master' into 3.0-features

2018-01-10 15:23:35 -08:00
parent 16e07a0e99 b943f6b736
commit cf2f922e30
16 changed files with 373 additions and 155 deletions
--- a/spec/support/jasmine.yml
+++ b/spec/support/jasmine.yml
@@ -3,6 +3,7 @@
 src_dir:
  - 'src'
 src_files:
+  - 'core/requireCore.js'
  - 'core/base.js'
  - 'core/util.js'
  #end of known dependencies