upgraded oj due to ohler55/oj#229

unepwcmc · Apr 29, 2016 · fc57014 · fc57014
1 parent 65013ea
commit fc57014
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
     netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    oj (2.11.1)
+    oj (2.15.0)
     orm_adapter (0.5.0)
     paper_trail (4.0.0.beta2)
       activerecord (>= 3.0, < 6.0)

diff --git a/vendor/cache/oj-2.11.1.gem b/vendor/cache/oj-2.11.1.gem
diff --git a/vendor/cache/oj-2.15.0.gem b/vendor/cache/oj-2.15.0.gem