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)
commit7b40e0e045368d350529d78208be0e6124f94b5a
tree00fc2ac0eef5e2849f19e30c7347c444fbd7fee5
parent251d07aa41b6830a0a2f2a51c14fa94586d843c2
parentfa0e442fa889a49a0b7517567cb20beedc31c5aa
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/AccessRight.pm
FS/FS/Schema.pm
httemplate/elements/menu.html