Merge #574: develop into master for 2020 release

nrc-cnrc · Jan 31, 2020 · 7b99451 · 7b99451
2 parents f0311c7 + c5bed99
commit 7b99451
Show file tree

Hide file tree

Showing 98 changed files with 16,361 additions and 884 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,6 +48,7 @@ html
 ### ignore OS generated files
 *~
 ._*
+.vscode
 .DS_Store
 .DS_Store?
 .Spotlight-V100