Merge branch 'master' of ssh://bitbucket.org/benbeltran/n-s-o-vocal

[rbdr/r.bdr.sh] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 737f4ebd52bc547078df9ae0d1e0fe523c2df66e..ad7ebd6bb96e5bf9c8a414ce7bc6565f22230169 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
 GEM
   remote: http://rubygems.org/
   specs:

+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)

     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)

-    daemons (1.1.8)
+    daemons (1.1.9)

     directory_watcher (1.4.1)
     directory_watcher (1.4.1)

-    eventmachine (0.12.10)
+    eventmachine (1.0.0)

     fast-stemmer (1.0.1)
     fast-stemmer (1.0.1)

-    jekyll (0.6.2)
-      classifier (>= 1.3.1)
-      directory_watcher (>= 1.1.1)
-      liquid (>= 1.9.0)
-      maruku (>= 0.5.9)
-    liquid (2.3.0)
-    maruku (0.6.0)
+    jekyll (0.11.2)
+      albino (~> 1.3)
+      classifier (~> 1.3)
+      directory_watcher (~> 1.1)
+      kramdown (~> 0.13)
+      liquid (~> 2.3)
+      maruku (~> 0.5)
+    kramdown (0.14.0)
+    liquid (2.4.1)
+    maruku (0.6.1)

       syntax (>= 1.0.0)
       syntax (>= 1.0.0)

-    rack (1.2.5)
-    rack-jekyll (0.3.7)
-      jekyll (~> 0.6.2)
-      rack (~> 1.2.1)
+    posix-spawn (0.3.6)
+    rack (1.4.1)
+    rack-jekyll (0.3.5)
+      jekyll
+      rack

     rdiscount (1.6.8)
     syntax (1.0.0)
     rdiscount (1.6.8)
     syntax (1.0.0)

-    thin (1.4.1)
+    thin (1.5.0)

       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)


@@ -30,7 +36,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
   ruby
 
 DEPENDENCIES

-  jekyll
+  jekyll (~> 0.11.2)

   rack-jekyll
   rdiscount
   thin
   rack-jekyll
   rdiscount
   thin