From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 3 Oct 2017 16:36:51 +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=929783d1045757abbe5c84ff2439547b0f8eca23;hp=90430c5c67581b41b3c4ad48f70b9e443092977b

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