diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
tree | f373d05c4ea43bd335910f3603fab3d866a2486e /Gemfile.lock | |
parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f637c9bbe..6f0621f5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,6 +242,8 @@ GEM nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) + mario-redis-lock (1.2.0) + redis (~> 3, >= 3.0.5) method_source (0.8.2) microformats (4.0.7) json @@ -535,6 +537,7 @@ DEPENDENCIES letter_opener_web (~> 1.3) link_header (~> 0.0) lograge (~> 0.5) + mario-redis-lock (~> 1.2) microformats (~> 4.0) mime-types (~> 3.1) nokogiri (~> 1.7) |