Merge branch 'master' into midpoints-equiv

JuliaLang · Dec 15, 2020 · 25d4f2d · 25d4f2d
2 parents aef28d9 + bd0ddf3
commit 25d4f2d
Show file tree

Hide file tree

Showing 2,688 changed files with 48,592 additions and 20,149 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+/.github/workflows/ @JuliaLang/github-actions
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@
 /perf*
 .DS_Store
 .idea/*
+.vscode/*
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -189,7 +189,7 @@ Note: These instructions are for adding to or improving functionality in the bas
 
 Add new code to Julia's base libraries as follows (this is the "basic" approach; see a more efficient approach in the next section):
 
- 1. Edit the appropriate file in the `base/` directory, or add new files if necessary. Create tests for your functionality and add them to files in the `test/` directory. If you're editing C or Scheme code, most likely it lives in `src/` or one of its subdirectories, although some aspects of Julia's REPL initialization live in `ui/`.
+ 1. Edit the appropriate file in the `base/` directory, or add new files if necessary. Create tests for your functionality and add them to files in the `test/` directory. If you're editing C or Scheme code, most likely it lives in `src/` or one of its subdirectories, although some aspects of Julia's REPL initialization live in `cli/`.
 
  2. Add any new files to `sysimg.jl` in order to build them into the Julia system image.
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,3 +31,4 @@ @@
     /perf*
     .DS_Store
     .idea/*
+    .vscode/*