From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Apr 2020 08:18:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2574'
X-Git-Tag: live~3277
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bf9430f43ecfe1f99b6b0883e5c1b442ff47333f?hp=da07b633c22f3a49d2bea98c956009f6a196221f

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e99a8f351..e455f297b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,7 +18,7 @@
 //= require querystring
 
 /*
- * Called as the user scrolls/zooms around to maniplate hrefs of the
+ * Called as the user scrolls/zooms around to manipulate hrefs of the
  * view tab and various other links
  */
 window.updateLinks = function (loc, zoom, layers, object) {