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

This commit is contained in:
danielvincent 2010-10-05 13:40:10 -07:00
commit 33e478229e
2 changed files with 6 additions and 6 deletions

View file

@ -6,7 +6,7 @@ cross_server:
deploy_to: '/usr/local/app/diaspora'
user: 'root'
repo: 'git://github.com/diaspora/diaspora.git'
branch: 'salmon_refactor'
branch: 'master'
default_env: 'development'
servers:
tom: