aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2012-04-16 09:48:24 +0200
committerAlban Peignier2012-04-16 09:48:24 +0200
commit8db8451b65294a6d44220f1e2bd79d716eb08817 (patch)
tree68073a8325ddf86014a81d7e8bf82b76d07d1c85
parenta5d66a464ebda7be03ee97510fda02466bf6a2a8 (diff)
downloadchouette-core-8db8451b65294a6d44220f1e2bd79d716eb08817.tar.bz2
Update warbler. Refs #8
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e4e705f5e..536c6edca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,10 +180,10 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- jruby-jars (1.6.5.1)
+ jruby-jars (1.6.7)
jruby-openssl (0.7.4)
bouncy-castle-java
- jruby-rack (1.1.2)
+ jruby-rack (1.1.5)
json (1.6.6)
json (1.6.6-java)
launchy (2.0.5)
@@ -268,7 +268,7 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.8.0)
- rubyzip (0.9.5)
+ rubyzip (0.9.7)
sass (3.1.12)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
@@ -303,7 +303,7 @@ GEM
uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- warbler (1.3.2)
+ warbler (1.3.5)
jruby-jars (>= 1.4.0)
jruby-rack (>= 1.0.0)
rake (>= 0.8.7)