marcin mikołajczak 9e3468c833 Merge branch 'develop' into 'internal-webhooks' ... # Conflicts: # lib/pleroma/webhook.ex		2023-01-11 09:58:50 +00:00
..
gettext	Translated using Weblate (Ukrainian)	2022-11-12 22:13:38 +00:00
repo	Merge branch 'develop' into 'internal-webhooks'	2023-01-11 09:58:50 +00:00
scrubbers	Disable inline images	2022-11-26 16:21:15 -06:00
static	Merge remote-tracking branch 'soapbox/develop' into pleroma-events	2022-11-05 21:08:08 +01:00
templates	Bump minimum Elixir version to 1.10	2022-09-02 22:53:54 +02:00