aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/michelf/php-markdown/License.md
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-05-04 09:46:27 +0200
committerMario Vavti <mario@mariovavti.com>2018-05-04 09:46:27 +0200
commitbe4c9a9598350fb4333480f0c7b302acebcddfd4 (patch)
treefb0c2606ad4ca0bc1a710d6fdf82f55c326b3427 /vendor/michelf/php-markdown/License.md
parentf15c12376adad6534c8c0ea547a7548697eb8379 (diff)
parentbe852ba857f4cb8e75574a762945b50c8bddcff9 (diff)
downloadvolse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.gz
volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.bz2
volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.zip
Merge branch '3.4RC'3.4
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