diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
| commit | 3c4cab9be18ff543d025177b418ddd0b16050e68 (patch) | |
| tree | 3b4d32c978ecfaa656256509bf390d6ca22c6679 /COPYING | |
| parent | 9a98f48ec3f438e543a5a621624401bb22a0d44a (diff) | |
| parent | 41d78f91083b5017e6085150bfae71a842f5c47f (diff) | |
| download | pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.tar.gz pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.zip | |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -39,10 +39,3 @@ does not include the right to compile photos from Unsplash to replicate a similar or competing service. priv/static/images/city.jpg - ---- - -The files present under the priv/static/finmoji directory are copyright -Finland <https://finland.fi/emoji/>, and are distributed under the Creative -Commons Attribution-NonCommercial-NoDerivatives 4.0 International license, you -should have received a copy of the license file as CC-BY-NC-ND-4.0. |