From: Andy Allan <github@gravitystorm.co.uk>
Date: Wed, 2 Aug 2017 14:15:25 +0000 (+0100)
Subject: Merge pull request #1588 from Georeactor/master
X-Git-Tag: live~3352
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/60f2074baca1b36bf02b02be976a2527d60c5fef

Merge pull request #1588 from Georeactor/master

Update gem, fix icons on RTL/Arabic pages
---

60f2074baca1b36bf02b02be976a2527d60c5fef
diff --cc Gemfile.lock
index f73d4a5d8,4c398ccef..3cb46643a
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -386,10 -382,10 +386,10 @@@ DEPENDENCIE
    pg
    poltergeist
    psych
-   r2
+   r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
 -  rails (= 5.0.4)
 +  rails (= 5.0.5)
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    record_tag_helper