Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/rails3'

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Manuel Wiedenmann 2013-06-10 01:53:31 +02:00
commit 7a63394dac
6 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -65,4 +65,6 @@ group :development do
gem 'capistrano', '2.13.5'
gem 'capistrano-ext'
#gem 'common_deploy', require: false, path: '../../common_deploy' # pending foodcoops/foodsoft#34, git: 'git://github.com/fsmanuel/common_deploy.git'
# Avoid having content-length warnings
gem 'thin'
end