Merge remote-tracking branch 'upstream/master' into update-badges

markedjs · Mar 21, 2018 · cceac77 · cceac77
2 parents 265d6c1 + eef9de4
commit cceac77
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/release.md b/.github/PULL_REQUEST_TEMPLATE/release.md
@@ -19,7 +19,7 @@ Note: If merges to `master` occur after submitting this PR and before running `$
 
 In most cases, this should be someone different than the publisher.
 
-- [ ] Version in `package.json` has been updated (see [RELEASE.md](https://github.com/markedjs/marked/blob/master/RELEASE.md)).
+- [ ] Version in `package.json` has been updated (see [RELEASE.md](https://github.com/markedjs/marked/blob/master/docs/RELEASE.md)).
 - [ ] The `marked.min.js` has been updated; or,
 - [ ] release does not change library.
 - [ ] cm_autolinks is the only failing test (remove once CI is in place and all tests pass).

diff --git a/.npmignore b/.npmignore
@@ -1,2 +1,3 @@
 .git*
 test/
+docs
diff --git a/doc/todo.md b/doc/todo.md
diff --git a/AUTHORS.md → docs/AUTHORS.md~HEAD b/AUTHORS.md → docs/AUTHORS.md~HEAD