Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git] / config / .gitignore
1 lx-erp-local.conf
2 authentication.pl
3 console.conf