X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=9f2244222da3f36b1a7c25cba0bbb561ae91e883;hb=7fcbda702e76b6390076c28832f5aea80086d15a;hp=1114dc84de811cdc2e7e235684269a935c0a6ce0;hpb=cc93775ebf539598075c0b9afb96c60c8bede6b5;p=akkoma diff --git a/config/config.exs b/config/config.exs index 1114dc84d..9f2244222 100644 --- a/config/config.exs +++ b/config/config.exs @@ -100,9 +100,9 @@ config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], groups: [ # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` - Finmoji: "/finmoji/128px/*-128.png", - Custom: ["/emoji/*.png", "/emoji/custom/*.png"] - ] + Custom: ["/emoji/*.png", "/emoji/**/*.png"] + ], + default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json" config :pleroma, :uri_schemes, valid_schemes: [ @@ -223,7 +223,6 @@ config :pleroma, :instance, "text/html", "text/markdown" ], - finmoji_enabled: true, mrf_transparency: true, autofollowed_nicknames: [], max_pinned_statuses: 1,