logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 3bb78ac1527ef34806ce318dacbafdbbf46c040d
parent e07fb6e7dcc2e2780d0328fec09a5d32f5e7057c
Author: Sean King <seanking2919@protonmail.com>
Date:   Wed, 21 Dec 2022 22:36:54 -0700

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges

Diffstat:

Mpriv/gettext/static_pages.pot4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/priv/gettext/static_pages.pot b/priv/gettext/static_pages.pot @@ -156,8 +156,8 @@ msgid "Password changed!" msgstr "" #, elixir-autogen, elixir-format -#: lib/pleroma/web/templates/feed/feed/tag.atom.eex:15 -#: lib/pleroma/web/templates/feed/feed/tag.rss.eex:7 +#: lib/pleroma/web/templates/feed/feed/tag.atom.eex:12 +#: lib/pleroma/web/templates/feed/feed/tag.rss.eex:8 msgctxt "tag feed description" msgid "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse." msgstr ""