8 commits

Author	SHA1	Message	Date
Egor Kislitsyn	2a475622ee	Add Pleroma.Constants.as_local_public/0	2020-10-15 19:07:00 +04:00
Egor Kislitsyn	4f79bbbc31	Add local-only statuses	2020-10-15 18:37:44 +04:00
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	2020-10-14 17:31:45 +00:00
Mark Felder	ed61002815	Undo API breaking changes	2020-10-14 11:03:17 -05:00
Mark Felder	8b20c4d275	Missed tests	2020-10-13 16:15:28 -05:00
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -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