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 | |
| 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')
| -rw-r--r-- | Gemfile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,18 +1,18 @@ source "http://rubygems.org" group :development do - gem 'rake', '~> 0.9.2' + gem 'rake', '~> 0.9' gem 'rack', '~> 1.4.1' - gem 'jekyll', '~> 0.11.2' + gem 'jekyll', '~> 0.12' gem 'rdiscount', '~> 1.6.8' - gem 'pygments.rb', '~> 0.2.12' + gem 'pygments.rb', '~> 0.3.4' gem 'RedCloth', '~> 4.2.9' - gem 'haml', '~> 3.1.6' - gem 'compass', '~> 0.12.1' + gem 'haml', '~> 3.1.7' + gem 'compass', '~> 0.12.2' gem 'rubypants', '~> 0.2.0' gem 'rb-fsevent', '~> 0.9' gem 'stringex', '~> 1.4.0' gem 'liquid', '~> 2.3.0' end -gem 'sinatra', '~> 1.3.2' +gem 'sinatra', '~> 1.3.3' |