Merge branch 'sinatra_static_server' of https://github.com/scottwater/octopress into scottwater-sinatra_static_server

Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Brandon Mathis
2011-09-08 10:31:36 -05:00
3 changed files with 40 additions and 37 deletions

26
Gemfile
View File

@ -1,13 +1,17 @@
source "http://rubygems.org"
gem 'rake'
gem 'rack'
gem 'jekyll'
gem 'rdiscount'
gem 'pygments.rb'
gem 'RedCloth'
gem 'haml', '>= 3.1'
gem 'compass', '>= 0.11'
gem 'rubypants'
gem 'rb-fsevent'
gem 'stringex'
group :development do
gem 'rake'
gem 'rack'
gem 'jekyll'
gem 'rdiscount'
gem 'pygments.rb'
gem 'RedCloth'
gem 'haml', '>= 3.1'
gem 'compass', '>= 0.11'
gem 'rubypants'
gem 'rb-fsevent'
gem 'stringex'
end
gem 'sinatra', '1.2.6'