4 Commits

Author	SHA1	Message	Date
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	2020-11-04 16:51:42 +01:00
Mark Felder	ed61002815	Undo API breaking changes	2020-10-14 11:03:17 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00