Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJonathan Prykop <jonathan@freeside.biz>
Mon, 16 Feb 2015 19:53:36 +0000 (13:53 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Mon, 16 Feb 2015 19:53:36 +0000 (13:53 -0600)
1  2 
FS/FS/AccessRight.pm
FS/FS/Schema.pm
httemplate/elements/menu.html

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