aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-18 12:40:27 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-18 12:40:27 +0100
commit8147ff76a49206a08999f420206d971de10db12e (patch)
treedea3412c8e30cfab464557bcbe4c5c3fb08bc33e /COPYING
parent9eba6ff469bdea8f341af06ef23c8bb4bd3a6869 (diff)
parente3ffc8fdee30be41046b985fe6e7034fb580b0c8 (diff)
downloadShaarli-8147ff76a49206a08999f420206d971de10db12e.tar.gz
Shaarli-8147ff76a49206a08999f420206d971de10db12e.tar.zst
Shaarli-8147ff76a49206a08999f420206d971de10db12e.zip
merge
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 4 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index 5a825402..d8241e50 100644
--- a/COPYING
+++ b/COPYING
@@ -72,6 +72,10 @@ 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
75Files: tpl/default/img/sad_star.png 79Files: tpl/default/img/sad_star.png
76License: MIT License (http://opensource.org/licenses/MIT) 80License: MIT License (http://opensource.org/licenses/MIT)
77Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material 81Copyright: (C) 2015 kalvn - https://github.com/kalvn/Shaarli-Material