diff options
author | kaniini <nenolod@gmail.com> | 2019-05-20 18:17:42 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-05-20 18:17:42 +0000 |
commit | 943d1b2f269eaa1fc29702fed45eb8a11164598b (patch) | |
tree | 987eb9e5a5c85796de422dce0335ddf3aede256f /config/config.exs | |
parent | 643b56347879698a60c206ffb6f4e1e70011c552 (diff) | |
parent | daeae8e2e7c506b72c66dea6ac790408f948ec16 (diff) | |
download | pleroma-943d1b2f269eaa1fc29702fed45eb8a11164598b.tar.gz pleroma-943d1b2f269eaa1fc29702fed45eb8a11164598b.zip |
Merge branch 'feature/user-configurable-mascot' into 'develop'
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index bab47a8a2..72908266d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -276,6 +276,19 @@ config :pleroma, :frontend_configurations, showInstanceSpecificPanel: true } +config :pleroma, :assets, + mascots: [ + pleroma_fox_tan: %{ + url: "/images/pleroma-fox-tan-smol.png", + mime_type: "image/png" + }, + pleroma_fox_tan_shy: %{ + url: "/images/pleroma-fox-tan-shy.png", + mime_type: "image/png" + } + ], + default_mascot: :pleroma_fox_tan + config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, |