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

author Ivan Kohler <ivan@freeside.biz>

Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)

committer Ivan Kohler <ivan@freeside.biz>

Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)
author Ivan Kohler <ivan@freeside.biz>
Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)
committer Ivan Kohler <ivan@freeside.biz>
Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)
diff --cc FS/FS/AccessRight.pm
Simple merge
diff --cc FS/FS/Conf.pm
Simple merge
diff --cc FS/FS/access_right.pm
Simple merge
diff --cc FS/FS/cust_main_Mixin.pm
Simple merge
author	Ivan Kohler <ivan@freeside.biz>
	Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)
committer	Ivan Kohler <ivan@freeside.biz>
	Fri, 25 Aug 2017 22:06:19 +0000 (15:06 -0700)
		1	2
FS/FS/AccessRight.pm	patch \|	diff1 \|	diff2 \|	blob \| history
FS/FS/Conf.pm	patch \|	diff1 \|	diff2 \|	blob \| history
FS/FS/access_right.pm	patch \|	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_main_Mixin.pm	patch \|	diff1 \|	diff2 \|	blob \| history