Merge branch 'ZNCv1' into MixedVersions
[ZNCAdmin.git] / .gitignore
1 config.inc.php
2 .project