Merge commit '17f0f6fa9fa57f3fd4b124bb8371dd715ad34c15' into lti_param_model

2017-01-12 15:12:54 +01:00
parent dd4c789fed 17f0f6fa9f
commit 43f1735fa0
3 changed files with 7 additions and 5 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -123,7 +123,7 @@ GEM
    erubis (2.7.0)
    eventmachine (1.0.9.1)
    eventmachine (1.0.9.1-java)
-    excon (0.45.4)
+    excon (0.54.0)
    execjs (2.6.0)
    factory_girl (4.5.0)
      activesupport (>= 3.0.0)