diff options
| author | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
|---|---|---|
| committer | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
| commit | 2fe9da91f5a4b5ba3edaee47ee24dbce523e739e (patch) | |
| tree | cca3792ae030b550015633b4b855451fa8455bc3 /Gemfile.lock | |
| parent | e1020ed888439a480cb13af2585f9fea5283c609 (diff) | |
| parent | 4790b939807be4d9abcc567f02773ff24b99320d (diff) | |
| download | my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.tar.xz my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.zip | |
Merge branch 'master' of github.com:imathis/octopress
Conflicts:
plugins/category_generator.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c1bf8d5..c235b2cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,68 +2,63 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.9) - albino (1.3.3) - posix-spawn (>= 0.3.6) - blankslate (2.1.2.4) chunky_png (1.2.5) classifier (1.3.3) fast-stemmer (>= 1.0.0) - compass (0.12.1) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) directory_watcher (1.4.1) fast-stemmer (1.0.1) - ffi (1.0.11) fssm (0.2.9) - haml (3.1.6) - jekyll (0.11.2) - albino (~> 1.3) + haml (3.1.7) + jekyll (0.12.0) classifier (~> 1.3) directory_watcher (~> 1.1) - kramdown (~> 0.13) + kramdown (~> 0.13.4) liquid (~> 2.3) maruku (~> 0.5) - kramdown (0.13.6) + pygments.rb (~> 0.3.2) + kramdown (0.13.8) liquid (2.3.0) - maruku (0.6.0) + maruku (0.6.1) syntax (>= 1.0.0) posix-spawn (0.3.6) - pygments.rb (0.2.12) - rubypython (~> 0.5.3) + pygments.rb (0.3.4) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.1.0) rack (1.4.1) - rack-protection (1.2.0) + rack-protection (1.3.2) rack rake (0.9.2.2) rb-fsevent (0.9.1) rdiscount (1.6.8) rubypants (0.2.0) - rubypython (0.5.3) - blankslate (>= 2.1.2.3) - ffi (~> 1.0.7) - sass (3.1.18) - sinatra (1.3.2) + sass (3.1.20) + sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) stringex (1.4.0) syntax (1.0.0) tilt (1.3.3) + yajl-ruby (1.1.0) PLATFORMS ruby DEPENDENCIES RedCloth (~> 4.2.9) - compass (~> 0.12.1) - haml (~> 3.1.6) - jekyll (~> 0.11.2) + compass (~> 0.12.2) + haml (~> 3.1.7) + jekyll (~> 0.12) liquid (~> 2.3.0) - pygments.rb (~> 0.2.12) + pygments.rb (~> 0.3.4) rack (~> 1.4.1) - rake (~> 0.9.2) + rake (~> 0.9) rb-fsevent (~> 0.9) rdiscount (~> 1.6.8) rubypants (~> 0.2.0) - sinatra (~> 1.3.2) + sinatra (~> 1.3.3) stringex (~> 1.4.0) |