10 commits

Author	SHA1	Message	Date
lain	04b7505c75	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-10-26 17:50:34 +01:00
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	2020-10-17 17:53:47 +03:00
Egor Kislitsyn	3985c1b450	Fix warnings	2020-10-15 16:54:59 +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
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	2020-10-13 19:22:32 -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