Merge branch 'master' into experiment-ecosystem-groupings

This commit is contained in:
Brendan Forster 2018-11-09 08:14:30 -04:00
commit 3352aa40a9
2 changed files with 5 additions and 0 deletions

View File

@ -7,3 +7,4 @@ erl_crash.dump
*.ez
*.beam
/config/*.secret.exs
.elixir_ls/

View File

@ -205,6 +205,10 @@ pythontex-files-*/
# todonotes
*.tdo
# vhistory
*.hst
*.ver
# easy-todo
*.lod