diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-19 09:27:18 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-19 09:27:18 +0200 |
| commit | 88a0395a58739ff0a4bc8ff79bc0b60ac2c0f736 (patch) | |
| tree | 301ba59a7d214d5cf655263c95d731b9f18b6566 /Gemfile.lock | |
| parent | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (diff) | |
| parent | 59c68c1a74d5398b9c31489744ff8eca82e2ce50 (diff) | |
Merge branch 'master' into glitch-soc/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 1bb512480..ed35f4a7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -324,6 +324,8 @@ GEM nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) + makara (0.4.0) + activerecord (>= 3.0.0) marcel (0.3.2) mimemagic (~> 0.3.2) mario-redis-lock (1.2.1) @@ -700,6 +702,7 @@ DEPENDENCIES letter_opener_web (~> 1.3) link_header (~> 0.0) lograge (~> 0.10) + makara (~> 0.4) mario-redis-lock (~> 1.2) memory_profiler microformats (~> 4.0) |