Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE...
[freeside.git] / debian / conffiles
2015-06-11 Jeremy DavisReverting changes on Ticket #36760
2015-06-11 Jeremy DavisTicket #36760 Preserve NG-selfservice configuration...
2014-10-02 Jeremy DavisConflicts: