Merge branch 'master' into glitch-soc/merge-upstream

[mastodon.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index b0efd1bfb9135e9a68e32155259f31fb1eef649f..cacf3adf4e8523391a59433f204daddb5a90d674 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,6 +274,8 @@ GEM
     hiredis (0.6.1)
     hitimes (1.3.0)
     hkdf (0.3.0)
+    html2text (0.2.1)
+      nokogiri (~> 1.6)
     htmlentities (4.3.4)
     http (3.3.0)
       addressable (~> 2.3)
@@ -694,6 +696,7 @@ DEPENDENCIES
   goldfinger (~> 2.1)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)
+  html2text
   htmlentities (~> 4.3)
   http (~> 3.3)
   http_accept_language (~> 2.1)