Alex Gleason 48983e9421 Merge remote-tracking branch 'upstream/develop' into by-approval		2020-07-14 18:56: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	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-14 18:56:40 -05:00
scrubbers
static	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	2020-07-10 12:26:53 +02:00
templates	dynamic_configuration renaming	2020-01-10 19:34:19 +03:00