4 commits

Author	SHA1	Message	Date
feld	6c8469664a	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	2020-11-04 17:05:21 +03:00
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
Alexander Strizhakov	4c4ea9a348	changes after rebase	2020-10-13 17:10:34 +03:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00