1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-24 01:35:34 +01:00
pleroma/priv
rinpatch 6c3273892f Merge branch 'sync-stable/2.2.0' into 'develop'
Import stable commits into develop after releasing 2.2.0

Closes #2275, #1516, #2257, #2242, #1668, and #2236

See merge request pleroma/pleroma!3151
2020-11-17 12:40:42 +00:00
..
gettext Added translation using Weblate (Hebrew) 2020-11-17 11:15:01 +00:00
repo Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' 2020-11-13 13:35:47 +00:00
scrubbers HTML: Compile Scrubbers on boot 2019-12-08 20:35:41 +03:00
static Import stable commits into develop after releasing 2.2.0 2020-11-17 15:14:25 +03:00
templates Support enabling upload filters during instance gen 2020-10-12 11:19:48 -05:00