Merge remote-tracking branch 'upstream/pull/1804'

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7afbffb161bfb4bcffd30c67e5299b460f9282a0..4461c5ab71cc950e43a0c5ae5ac82003e0874840 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
-//= require jquery
+//= require jquery3
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery.cookie