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)
commit434137989f7343ada30ceff4056c5f75ef8d9d27
treef85c4933086bd2311f1d905f2e98a42c2cf6406c
parenta0e3c43f10daaff70886197ff40a47d92f2c345b
parent50b038e338455c5d20f48f99767767b70c515c31
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm
httemplate/view/cust_main/payment_history.html