Merge "Bug 1840106: update marked plugin from 0.6 to 0.7"

37b0d459 · Robert Lyon · Gerrit Code Review · bf9c3871 · 9b98b044 · 37b0d459
Commit 37b0d459 authored Oct 09, 2019 by Robert Lyon Committed by Gerrit Code Review Oct 09, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

htdocs/js/marked/README.Mahara htdocs/js/marked/README.Mahara +2 -1

htdocs/js/marked/marked.min.js htdocs/js/marked/marked.min.js +1 -1

No files found.
--- a/htdocs/js/marked/README.Mahara
+++ b/htdocs/js/marked/README.Mahara
@@ -3,10 +3,11 @@ Marked

 Name   : marked - a markdown parser
 Website: https://github.com/markedjs/marked
-Version: 0.6.0
+Version: 0.7.0
 Author : Christopher Jeffrey
 Licence: MIT

+Used in conjunction with clipboard.js for 'Copy x to the clipboard' buttons

 Changes:


--- a/htdocs/js/marked/marked.min.js
+++ b/htdocs/js/marked/marked.min.js