Merge branch 'master' of ben/halcyon into master

This commit is contained in:
Niklas Poslovski 2018-11-07 21:06:58 +00:00 committed by Gogs
commit 79b79e784e
1 changed files with 3 additions and 1 deletions

4
.gitignore vendored
View File

@ -1,2 +1,4 @@
config.ini
.ftpconfig
.ftpconfig
data/