diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-22 13:08:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-22 13:08:30 +0700 |
| commit | e8c2f9a73a37636a9a8ed5c2998617b841f482da (patch) | |
| tree | 4b194e631d2bbb58b8522c3d74a0b0c2ea09fedd /COPYING | |
| parent | 38926a063a39c4d4387049f5d364f72a9f8bd2de (diff) | |
| parent | 7fcbda702e76b6390076c28832f5aea80086d15a (diff) | |
| download | pleroma-e8c2f9a73a37636a9a8ed5c2998617b841f482da.tar.gz pleroma-e8c2f9a73a37636a9a8ed5c2998617b841f482da.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
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. |