diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
| commit | 7f692343c80ddf353712490edfbcdb14866f5685 (patch) | |
| tree | 7ef90078d87fafb1eb25986c92af17a9eede37be /COPYING | |
| parent | fc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-7f692343c80ddf353712490edfbcdb14866f5685.tar.gz pleroma-7f692343c80ddf353712490edfbcdb14866f5685.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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. |