diff options
| author | Erwan Leboucher <erwanleboucher@gmail.com> | 2017-04-07 12:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 12:43:56 +0200 |
| commit | 0c4e9fdda051d0322608c9abdaa158529c8feacd (patch) | |
| tree | db5e8aae085529913e4567c0a81a00c1d2b22356 /Gemfile.lock | |
| parent | a0f1f9c6649f44183b9c1525433c1c6e7f052492 (diff) | |
| parent | 624a9a7136159d460228a0c2f5df18a9ead3b7f2 (diff) | |
Merge branch 'master' into patch-4
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 408d85ade..f2a199931 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,6 +240,7 @@ GEM addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) + ox (2.4.11) paperclip (5.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -482,6 +483,7 @@ DEPENDENCIES nokogiri oj ostatus2 + ox paperclip (~> 5.1) paperclip-av-transcoder pg |