summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-06 11:59:01 +0000
committerlain <lain@soykaf.club>2020-04-06 11:59:01 +0000
commit349b9d86dc25ae9514781ef2ac56953fa357a031 (patch)
tree82fe9db708847369f7cbef107da9c6734cea8e4d /COPYING
parent8444e7ee9651f3b1836954a3891b5ae26ee79f99 (diff)
parent772bc258cde11b3203ad9420f69321ccd56db91a (diff)
downloadpleroma-349b9d86dc25ae9514781ef2ac56953fa357a031.tar.gz
pleroma-349b9d86dc25ae9514781ef2ac56953fa357a031.zip
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
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.