feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop' ... Fix activity expirations again See merge request pleroma/pleroma!2866		2020-08-13 17:38:19 +00: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 branch 'fix/activity-expirations-again' into 'develop'	2020-08-13 17:38:19 +00:00
scrubbers
static	Update frontend	2020-08-13 16:04:34 +02:00
templates