Commit 3352aa40 authored by Brendan Forster's avatar Brendan Forster

Merge branch 'master' into experiment-ecosystem-groupings

parents 22776453 c2bb55b8
...@@ -7,3 +7,4 @@ erl_crash.dump ...@@ -7,3 +7,4 @@ erl_crash.dump
*.ez *.ez
*.beam *.beam
/config/*.secret.exs /config/*.secret.exs
.elixir_ls/
...@@ -205,6 +205,10 @@ pythontex-files-*/ ...@@ -205,6 +205,10 @@ pythontex-files-*/
# todonotes # todonotes
*.tdo *.tdo
# vhistory
*.hst
*.ver
# easy-todo # easy-todo
*.lod *.lod
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment