diff options
author | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
commit | a8d81a68d62e982094110a340341756fbb6df4a9 (patch) | |
tree | 51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/michelf/php-markdown/License.md | |
parent | abe6ab477531916158c04e3d387cb02e839d28b6 (diff) | |
parent | 09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff) | |
download | volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2 volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/michelf/php-markdown/License.md')
-rw-r--r-- | vendor/michelf/php-markdown/License.md | 6 |
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 |