From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 17 Oct 2017 21:22:19 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=dfbcb60e8b9207bd9aa7ebd297ff9d2599121bf5;hp=689738f7c234903160cbe23f337c11f8c0621f00

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/Makefile b/Makefile
index a1e4566a2..3486b7967 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
-TORRUS_ENABLED = 1
+#TORRUS_ENABLED = 1
 
 # for auto-version updates, so we can "make release" more things automatically
 RPM_SPECFILE = rpm/freeside.spec