From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Nov 2017 09:45:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1668'
X-Git-Tag: live~3295
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/00a51bff99bccedffee33cdc4a402825d7ffe99e?hp=554ff7824ad6e9596f9cb91e39fdbf097a6274b4

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7afbffb16..4461c5ab7 100644
--- 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