projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b67c9f 15d596e)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 10 Feb 2018 03:10:00 +0000 (19:10 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 10 Feb 2018 03:10:00 +0000 (19:10 -0800)
1  2 
FS/FS/Schema.pm patch | diff1 | diff2 | blob | history
FS/FS/cdr.pm patch | diff1 | diff2 | blob | history
httemplate/elements/menu.html patch | diff1 | diff2 | blob | history

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