Mark Felder 44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field		2021-01-18 12:05:05 -06:00
..
gettext	Merge branch 'support/2255_posix_errors' into 'develop'	2020-12-15 15:16:03 +00:00
repo	Merge branch 'develop' into refactor/approval_pending_user_field	2021-01-18 12:05:05 -06:00
scrubbers	scrubbers/default: Add ruby element and it's childs	2020-11-25 00:40:21 +01:00
static	Update AdminFE: pleroma/admin-fe@d4c7989f05	2021-01-18 11:25:13 -06:00
templates	Do not include pool_size in the template. It encourages unwanted fiddling :)	2020-12-21 15:19:24 -06:00