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

Merge branch master into i18n

Browse source
This commit is contained in:
Manuel Wiedenmann 2013-06-14 02:02:57 +02:00
commit 5b7ec86ed6
71 changed files with 5470 additions and 2861 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -65,7 +65,9 @@ group :development do
# Deploy with Capistrano
gem 'capistrano', '2.13.5'
gem 'capistrano-ext'
gem 'common_deploy', require: false, path: '../../common_deploy' #git: 'git://github.com/fsmanuel/common_deploy.git'
#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
# Gems left for backwards compatibility