summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-04-07 14:09:43 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-04-07 14:09:43 +0300
commit2b7d7bbd2dc3121488592a958c29ba6a418e0104 (patch)
treed4d963f9cc8afeae63a7666acab78eae8a8a8c43 /COPYING
parentdbcfac11b45b367185a3b18a2db3e3fb07e8f20d (diff)
parent1d4ab06505ec5143dbb1d78d718fa9efd1497751 (diff)
downloadpleroma-2b7d7bbd2dc3121488592a958c29ba6a418e0104.tar.gz
pleroma-2b7d7bbd2dc3121488592a958c29ba6a418e0104.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 0aede0fba..3140c8038 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Unless otherwise stated this repository is copyright © 2017-2019
+Unless otherwise stated this repository is copyright © 2017-2020
Pleroma Authors <https://pleroma.social/>, and is distributed under
The GNU Affero General Public License Version 3, you should have received a
copy of the license file as AGPL-3.
@@ -23,7 +23,7 @@ priv/static/images/pleroma-fox-tan-shy.png
---
-The following files are copyright © 2017-2019 Pleroma Authors
+The following files are copyright © 2017-2020 Pleroma Authors
<https://pleroma.social/>, and are distributed under the Creative Commons
Attribution-ShareAlike 4.0 International license, you should have received
a copy of the license file as CC-BY-SA-4.0.