X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a98a2a021305e759f5c0fd67ea9d5ddcb3c14a5c..8eef66cee2837ce5df84906dbcbf4c5a8df3bea2:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 350824532..23c4297ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,13 +46,14 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     hike (1.2.1)
     httpclient (2.2.4)
     i18n (0.6.0)
+    iconv (0.1)
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
@@ -140,7 +141,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    uglifier (1.2.2)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -154,6 +155,7 @@ DEPENDENCIES
   composite_primary_keys (>= 4.1.2)
   dynamic_form
   httpclient
+  iconv
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcache-client