aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/michelf/php-markdown/License.md
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-03-27 21:11:34 -0400
committerAndrew Manning <tamanning@zoho.com>2018-03-27 21:11:34 -0400
commit1dc795722a8e748ebb98e8fab778cd4686a0654f (patch)
tree4f4a4e8dea10090106c4d54a02c6860332cd9df4 /vendor/michelf/php-markdown/License.md
parentdcd658f12ea60945678717e3c310e94ece7b1f96 (diff)
parentc98776923a3aed4a0a17ca1412787de3b718eba9 (diff)
downloadvolse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.gz
volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.bz2
volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.zip
Merge branch 'dev' into oauth2
Diffstat (limited to 'vendor/michelf/php-markdown/License.md')
-rw-r--r--vendor/michelf/php-markdown/License.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/michelf/php-markdown/License.md b/vendor/michelf/php-markdown/License.md
index c16197b69..b3df08f99 100644
--- a/vendor/michelf/php-markdown/License.md
+++ b/vendor/michelf/php-markdown/License.md
@@ -1,11 +1,11 @@
PHP Markdown Lib
-Copyright (c) 2004-2016 Michel Fortin
+Copyright (c) 2004-2018 Michel Fortin
<https://michelf.ca/>
All rights reserved.
Based on Markdown
-Copyright (c) 2003-2006 John Gruber
-<https://daringfireball.net/>
+Copyright (c) 2003-2006 John Gruber
+<https://daringfireball.net/>
All rights reserved.
Redistribution and use in source and binary forms, with or without