Merge branch 'master' into experiment-ecosystem-groupings

shiftkey · shiftkey · commit 3352aa40a954 · 2018-11-09T08:14:30.000-04:00
diff --git a/Elixir.gitignore b/Elixir.gitignore
@@ -7,3 +7,4 @@ erl_crash.dump
 *.ez
 *.beam
 /config/*.secret.exs
+.elixir_ls/
diff --git a/TeX.gitignore b/TeX.gitignore
@@ -205,6 +205,10 @@ pythontex-files-*/
 # todonotes
 *.tdo
 
+# vhistory
+*.hst
+*.ver
+
 # easy-todo
 *.lod
 
