aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorXinhui2017-03-24 17:16:57 +0100
committerXinhui2017-03-24 17:16:57 +0100
commit6580da810148d4ff90f69a7581d07c6bd41c1809 (patch)
tree03e5d0b82bfacef479fef71d55fcd2beabc1da80 /app/assets/javascripts/application.js
parent8611cc5a73ec5033bd177e7999cf28174290b6ed (diff)
parent2c21e6dbbd2ed85070ee1ebdd26ee97882f424dd (diff)
downloadchouette-core-6580da810148d4ff90f69a7581d07c6bd41c1809.tar.bz2
Merge branch 'master' into staging
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r--app/assets/javascripts/application.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3bce3ec7d..b90f7539d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,3 +21,5 @@
//= require footable/footable.sort
//= require_directory ./plugins
//= require_directory .
+require('whatwg-fetch')
+require('babel-polyfill')