Merge pull request #1588 from Georeactor/master
authorAndy Allan <github@gravitystorm.co.uk>
Wed, 2 Aug 2017 14:15:25 +0000 (15:15 +0100)
committerGitHub <noreply@github.com>
Wed, 2 Aug 2017 14:15:25 +0000 (15:15 +0100)
Update gem, fix icons on RTL/Arabic pages

1  2 
Gemfile
Gemfile.lock

diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
index f73d4a5d8b578ba4ce393d4ff5e8a8a05c3433e5,4c398ccef4ae02feda944a81b816ec77e9649ad4..3cb46643ad21eaabdd80d41647795743f5051e23
@@@ -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