Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Daniel Vincent Grippi 2010-09-15 10:27:07 -07:00
commit db98681538

View file

@ -30,7 +30,7 @@ set :deploy_to, all['deploy_to']
set :scm, :git
set :user, all['user']
#set :user, ARGV[0]
set :password, all['password']
set :password, all['password'] if all['password']
set :scm_verbose, true
set :repository, all['repo']
set :branch, all['branch']