Merge remote-tracking branch 'upstream/pull/1668'
authorTom Hughes <tom@compton.nu>
Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 9 Nov 2017 09:45:17 +0000 (09:45 +0000)
app/assets/javascripts/application.js

index 7afbffb161bfb4bcffd30c67e5299b460f9282a0..4461c5ab71cc950e43a0c5ae5ac82003e0874840 100644 (file)
@@ -1,4 +1,4 @@
-//= require jquery
+//= require jquery3
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery.cookie