diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:16:51 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:16:51 +0300 |
| commit | a21baf89d874823137cc49052cfe8da769ac0748 (patch) | |
| tree | 20ed514fe2b13beebf0221d844745252f7604c02 /COPYING | |
| parent | dc2637c18880160286f50505b1140a58fdfdf7d1 (diff) | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| download | pleroma-a21baf89d874823137cc49052cfe8da769ac0748.tar.gz pleroma-a21baf89d874823137cc49052cfe8da769ac0748.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
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. |