lain 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'" ... This reverts merge request !2380		2020-04-14 16:31:30 +00:00
..
gettext
repo	Revert "Merge branch 'marker-update-fix' into 'develop'"	2020-04-14 16:31:30 +00:00
scrubbers
static	Update AdminFE build in preparation for Pleroma 2.0.2	2020-03-31 13:05:16 -05:00
templates