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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2931f35..4b56eae 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3995,7 +3995,7 @@ and customer address. Include units.',
     'type'        => 'select',
     'multiple'    => 1,
     'select_hash' => [ 
-      'address1' => 'Billing address',
+      #'address1' => 'Billing address',
     ],
   },