Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 24 Oct 2015 22:44:30 +0000 (15:44 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 24 Oct 2015 22:44:30 +0000 (15:44 -0700)
1  2 
FS/FS/Conf.pm
httemplate/view/cust_main/payment_history.html

diff --cc FS/FS/Conf.pm
Simple merge