Merge branch 'master' into develop

This commit is contained in:
Miguel Ortiz
2019-11-07 14:53:27 -05:00
committed by GitHub
16 changed files with 269 additions and 36 deletions

3
.gitignore vendored
View File

@ -18,4 +18,7 @@
/apache2/ssl/*.csr
/apache2/ssl/*.org
/.devcontainer/*
!/.devcontainer/devcontainer.example.json
.DS_Store