aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2017-01-06 18:34:36 +0100
committerVirtualTam <virtualtam+github@flibidi.net>2017-01-07 14:49:39 +0100
commit3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb (patch)
treedbf45980d63c690a3e8474bda21e90fdab863fa1 /COPYING
parentee6f4b64a91d76070f930cdf7602ab4686714c7a (diff)
downloadShaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.tar.gz
Shaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.tar.zst
Shaarli-3ee5c69777af4d5b20cfd8e89e1cc3cf13f640eb.zip
Add an AUTHORS file, simplify COPYING, bump year to 2017
Added: - AUTHORS file listing Shaarli contributors - mailmap information to group a Git author's different aliases - Makefile target to list contributors from Git commit data Changed: - Simplify COPYING by using a single "Shaarli Community" entry - Bump year to 2017 See: - man git-shortlog - https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING28
1 files changed, 1 insertions, 27 deletions
diff --git a/COPYING b/COPYING
index 547ea570..4bbdf2b3 100644
--- a/COPYING
+++ b/COPYING
@@ -1,33 +1,7 @@
1Files: * 1Files: *
2License: zlib/libpng 2License: zlib/libpng
3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> 3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
4 (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr> 4 (c) 2011-2017 The Shaarli Community, see AUTHORS
5 (c) 2011-2015 David Sferruzza <david.sferruzza@gmail.com>
6 (c) 2011-2015 Christophe HENRY <christophe.henry@sbgodin.fr>
7 (c) 2011-2015 Mathieu Chabanon <git@matchab.fr>
8 (c) 2011-2015 BoboTiG <bobotig@gmail.com>
9 (c) 2011-2015 Bronco <bronco@warriordudimanche.net>
10 (c) 2011-2015 Emilien Klein <emilien@klein.st>
11 (c) 2011-2015 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
12 (c) 2011-2015 Lionel Martin <renarddesmers@gmail.com>
13 (c) 2011-2015 lehollandaisvolant <levoltigeurhollandais@gmail.com>
14 (c) 2011-2015 timo van neerden <fire@lehollandaisvolant.net>
15 (c) 2011-2015 nodiscc <nodiscc@gmail.com>
16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>
18 (c) 2011-2015 Aurélien "VirtualTam" Tamisier <virtualtam@flibidi.net>
19 (c) 2011-2015 qwertygc <champlywood@free.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 Fanch <fanch-github@qth.fr>
24 (c) 2015 Guillaume Virlet <github@virlet.org>
25 (c) 2015 Felix Bartels <felix@host-consultants.de>
26 (c) 2015 Marsup <marsup@gmail.com>
27 (c) 2015 Miloš Jovanović <mjovanovic@gmail.com>
28 (c) 2015 Nicolás Danelón <hola@nicolasdanelon.com.ar>
29 (c) 2015 TsT <tst2005@gmail.com>
30
31 5
32Files: inc/reset.css 6Files: inc/reset.css
33License: BSD (http://opensource.org/licenses/BSD-3-Clause) 7License: BSD (http://opensource.org/licenses/BSD-3-Clause)