Merge branch 'develop' into feature/docker

This commit is contained in:
Sebastian Limbach
2017-01-31 19:48:38 +01:00
committed by GitHub
77 changed files with 1009 additions and 1200 deletions

1
.gitignore vendored
View File

@@ -59,6 +59,7 @@ Temporary Items
# Ignore all modules except the default modules.
/modules/**
!/modules/default
!/modules/default/**
!/modules/README.md**