aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2016-10-22 12:53:15 +0200
committerGitHub <noreply@github.com>2016-10-22 12:53:15 +0200
commit761b4e283737a48934457855448df98e8014ba73 (patch)
tree3a98fc6dee7edd3a13f335f97fb9bc4faf95f064 /COPYING
parent3d5e0aede31e07f060e3ca470d36374c54d5040c (diff)
parentc5941f316a49c94eff354b63e75b3add98ac4aea (diff)
downloadShaarli-761b4e283737a48934457855448df98e8014ba73.tar.gz
Shaarli-761b4e283737a48934457855448df98e8014ba73.tar.zst
Shaarli-761b4e283737a48934457855448df98e8014ba73.zip
Merge pull request #674 from ArthurHoaro/parsedown-composer
Use Composer for Parsedown and fix an issue with links
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 0 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index 28939100..22929463 100644
--- a/COPYING
+++ b/COPYING
@@ -72,10 +72,6 @@ Files: plugins/wallabag/wallabag.png
72License: MIT License (http://opensource.org/licenses/MIT) 72License: MIT License (http://opensource.org/licenses/MIT)
73Copyright: (C) 2015 Nicolas LÅ“uillet - https://github.com/wallabag/wallabag 73Copyright: (C) 2015 Nicolas LÅ“uillet - https://github.com/wallabag/wallabag
74 74
75Files: plugins/markdown/Parsedown.php
76License: MIT License (http://opensource.org/licenses/MIT)
77Copyright: (C) 2015 Emanuil Rusev - https://github.com/erusev/parsedown
78
79---------------------------------------------------- 75----------------------------------------------------
80ZLIB/LIBPNG LICENSE 76ZLIB/LIBPNG LICENSE
81 77