From a1d00d41e50c66d25aec8e98f64fc98fccffcff3 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 25 Oct 2010 19:33:23 -0700
Subject: [PATCH] deploys 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 dda2cc200..06a6747e1 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: 'twitter'
+  branch: 'master'
   default_env: 'development'
 servers:
   tom: