diff options
| author | davidtsadler <davidtsadler@googlemail.com> | 2012-04-29 18:05:33 +0100 |
|---|---|---|
| committer | davidtsadler <davidtsadler@googlemail.com> | 2012-04-29 18:05:33 +0100 |
| commit | 115592c9b76e42c526234c88a325793b4ec5d150 (patch) | |
| tree | 0e4fa3bde2ae631c101a577a10015137aeb5bffe | |
| parent | 4c00183b9cd9fe326596257e5ac2e24d30fe473c (diff) | |
| parent | 31b97413cd99290ad8436cca2ca962a72f00747b (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | .rvmrc | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ #!/usr/bin/env bash -ruby_string="ruby-1.9.2-p290" +ruby_string="ruby-1.9.3" gemset_name="jekyll-blog" if rvm list strings | grep -q "${ruby_string}" ; then diff --git a/Gemfile.lock b/Gemfile.lock index 72e62f4..37e49fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM classifier (1.3.3) fast-stemmer (>= 1.0.0) directory_watcher (1.4.1) - fast-stemmer (1.0.0) + fast-stemmer (1.0.1) jekyll (0.11.2) albino (~> 1.3) classifier (~> 1.3) @@ -15,11 +15,11 @@ GEM kramdown (~> 0.13) liquid (~> 2.3) maruku (~> 0.5) - kramdown (0.13.4) + kramdown (0.13.5) liquid (2.3.0) maruku (0.6.0) syntax (>= 1.0.0) - nokogiri (1.5.0) + nokogiri (1.5.2) posix-spawn (0.3.6) rake (0.9.2.2) rdiscount (1.6.8) |