13 commits

Author	SHA1	Message	Date
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	40f3cdc030	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Alexander Strizhakov	5f2071c458	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	7f5dbb0201	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	b081080dd9	fixes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	f679486540	rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	c4c5caedd8	changes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	b720ad2264	files consistency after rebase	2020-10-13 16:44:01 +03:00
Alexander Strizhakov	c5efded5fd	files consistency for new files	2020-10-13 16:44:00 +03:00
Alexander Strizhakov	e33782455d	updates after rebase	2020-10-13 16:43:59 +03:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00