Merge branch 'master' into develop

2019-12-26 11:55:09 -05:00
parent 6b96891e47 f64360ab74
commit aec544961c
26 changed files with 2502 additions and 81 deletions
@@ -20,5 +20,6 @@

 /.devcontainer/*
 !/.devcontainer/devcontainer.example.json
+!/.devcontainer/docker-compose.extend-example.yml

 .DS_Store