Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle

moodle · Sep 29, 2014 · 17382ec · 17382ec
2 parents c7ed723 + 1898798
commit 17382ec
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 76 deletions.
diff --git a/lib/markdown/License.md b/lib/markdown/License.md
@@ -1,5 +1,5 @@
 PHP Markdown Lib  
-Copyright (c) 2004-2013 Michel Fortin  
+Copyright (c) 2004-2014 Michel Fortin  
 <http://michelf.ca/>  
 All rights reserved.