Skip to content

Commit

Permalink
Merge branch 'MDL-60239-master' of git://github.com/ankitagarwal/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnicols committed Oct 2, 2017
2 parents e381834 + 503ce10 commit 9c8ab01
Show file tree
Hide file tree
Showing 7 changed files with 1,549 additions and 1,048 deletions.
4 changes: 2 additions & 2 deletions lib/markdown/License.md
@@ -1,11 +1,11 @@
PHP Markdown Lib
Copyright (c) 2004-2015 Michel Fortin
Copyright (c) 2004-2016 Michel Fortin
<https://michelf.ca/>
All rights reserved.

Based on Markdown
Copyright (c) 2003-2006 John Gruber
<http://daringfireball.net/>
<https://daringfireball.net/>
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down

0 comments on commit 9c8ab01

Please sign in to comment.