projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af42c70 583e90e)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 4 Apr 2012 22:41:23 +0000 (15:41 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 4 Apr 2012 22:41:23 +0000 (15:41 -0700)
1  2 
FS/FS/AccessRight.pm patch | diff1 | diff2 | blob | history
httemplate/elements/menu.html patch | diff1 | diff2 | blob | history

diff --cc FS/FS/AccessRight.pm
Simple merge
diff --cc httemplate/elements/menu.html
Simple merge
Freeside billing, trouble ticketing, network monitoring and provisioning