projects / freeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac20214 1add633)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 26 Jul 2015 22:41:26 +0000 (15:41 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 26 Jul 2015 22:41:26 +0000 (15:41 -0700)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Freeside billing, trouble ticketing, network monitoring and provisioning