Moerge branch 'master' of https://github.com/rstudio/learnr

rstudio · Nov 6, 2019 · c41c381 · c41c381
2 parents 7749d88 + 2150928
commit c41c381
Show file tree

Hide file tree

Showing 15 changed files with 692 additions and 521 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -16,3 +16,4 @@
 rsconnect/
 ^\.github/
 ^inst/tutorials/.*\.html$
+^LICENSE\.md$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -11,12 +11,12 @@ Authors@R: c(
   person(family = "Ajax.org B.V.", role=c("ctb", "cph"), comment= "Ace library"),
   person("Zeno", "Rocha", role = c("ctb", "cph"), comment = "clipboard.js library"),
   person("Nick", "Payne", role = c("ctb", "cph"), comment = "Bootbox library"),
-  person(family = "Mozilla", role = c("ctb", "cph"), comment = "localforage library")
+  person("Jake", "Archibald", role = c("ctb", "cph"), comment = "idb-keyval library")
   )
 Description: Create interactive tutorials using R Markdown. Use a combination
   of narrative, figures, videos, exercises, and quizzes to create self-paced
   tutorials for learning about R and R packages.
-License: Apache License 2.0 | file LICENSE
+License: Apache License (>= 2.0)
 URL: https://rstudio.github.io/learnr/
 BugReports: https://github.com/rstudio/learnr/issues
 Imports:

diff --git a/LICENSE b/LICENSE