aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2015-09-06 04:07:28 +0200
committerVirtualTam <virtualtam@flibidi.net>2015-09-06 04:07:28 +0200
commita02257b8aed58ef2f8536c877ce2fb222f84ac40 (patch)
treecb2285733c80bf9bb3df3696e6477d4857c00ba0
parentcd5c1028920a096cefc4b2dc3c15bb18c07d9101 (diff)
parentdb5453e4b6861ff8bad96ca09e55db6f75dd30a0 (diff)
downloadShaarli-a02257b8aed58ef2f8536c877ce2fb222f84ac40.tar.gz
Shaarli-a02257b8aed58ef2f8536c877ce2fb222f84ac40.tar.zst
Shaarli-a02257b8aed58ef2f8536c877ce2fb222f84ac40.zip
Merge pull request #344 from virtualtam/copying
COPYING: update contributor list
-rw-r--r--COPYING8
1 files changed, 7 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 7e222aaf..adc856e2 100644
--- a/COPYING
+++ b/COPYING
@@ -15,10 +15,16 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
15 (c) 2011-2015 nodiscc <nodiscc@gmail.com> 15 (c) 2011-2015 nodiscc <nodiscc@gmail.com>
16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com> 16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro> 17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>
18 (c) 2011-2015 virtualtam <virtualtam@flibidi.org> 18 (c) 2011-2015 Aurélien "VirtualTam" Tamisier <virtualtam@flibidi.net>
19 (c) 2011-2015 qwertygc <champlywood@free.fr> 19 (c) 2011-2015 qwertygc <champlywood@free.fr>
20 (c) 2011-2015 idleman <idleman@idleman.fr> 20 (c) 2011-2015 idleman <idleman@idleman.fr>
21 (c) 2015 Alexis Ju <alexis@effingo.be>
22 (c) 2015 dimtion <zizou.xena@gmail.com>
23 (c) 2015 Felix Bartels <felix@host-consultants.de>
24 (c) 2015 Marsup <marsup@gmail.com>
21 (c) 2015 Miloš Jovanović <mjovanovic@gmail.com> 25 (c) 2015 Miloš Jovanović <mjovanovic@gmail.com>
26 (c) 2015 Nicolás Danelón <hola@nicolasdanelon.com.ar>
27 (c) 2015 TsT <tst2005@gmail.com>
22 28
23 29
24Files: inc/reset.css 30Files: inc/reset.css