Alex Gleason 0022b2d2be Merge remote-tracking branch 'upstream/develop' into oauth-form		2020-07-26 15:50:40 -05:00
..
gettext	[#1940] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).	2020-07-19 21:35:57 +03:00
repo	Migration to fix malformed Pleroma.Formatter config	2020-07-22 14:32:45 -05:00
scrubbers	HTML: Compile Scrubbers on boot	2019-12-08 20:35:41 +03:00
static	OAuth form: tweak CSS	2020-07-19 20:14:38 -05:00
templates	dynamic_configuration renaming	2020-01-10 19:34:19 +03:00