From 45d40f27d9772ae3085791554b7266c416c10db8 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 5 Oct 2010 13:06:55 -0700
Subject: [PATCH] changed the deploy config back to master

---
 config/deploy_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index c53f90d60..c7477314a 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -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: