Merge branch 'master' into dev

This commit is contained in:
Vincent Letourneau
2018-03-29 08:56:24 +02:00
8 changed files with 30 additions and 1 deletions

5
.gitignore vendored
View File

@@ -19,4 +19,7 @@ data/
nbproject/
/nbproject/
/nbproject/private/
/nbproject/private/private.properties
/nbproject/private/private.properties
# SSL Certs
etc/ssl/