Ivan Tashkinov 1838f739d1 Merge remote-tracking branch 'remotes/origin/develop' into oauth-form ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/templates/layout/app.html.eex		2020-10-29 19:21:27 +03:00
..
gettext	Translated using Weblate (Chinese (Simplified))	2020-10-22 20:34:02 +00:00
repo	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-15 16:39:01 -05:00
scrubbers	HTML: Compile Scrubbers on boot	2019-12-08 20:35:41 +03:00
static	Merge remote-tracking branch 'upstream/develop' into oauth-form	2020-10-13 19:24:44 -05:00
templates	Support enabling upload filters during instance gen	2020-10-12 11:19:48 -05:00