67 Commits (732cc0ce46e8044909dd5205858c43f75fe3e937)

Author	SHA1	Message	Date
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	4 years ago
Egor Kislitsyn	3985c1b450	Fix warnings	4 years ago
lain	7a2f100061	ActivityPub: Show own replies to muted users. ... Aligns mute with block behavior.	4 years ago
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	4 years ago
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	4 years ago
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	4 years ago
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	4 years ago
Alexander Strizhakov	5f2071c458	changes after rebase	4 years ago
Alexander Strizhakov	7f5dbb0201	changes after rebase	4 years ago
Alexander Strizhakov	b081080dd9	fixes after rebase	4 years ago
Alexander Strizhakov	f679486540	rebase	4 years ago
Alexander Strizhakov	c4c5caedd8	changes after rebase	4 years ago
Alexander Strizhakov	b720ad2264	files consistency after rebase	4 years ago
Alexander Strizhakov	c5efded5fd	files consistency for new files	4 years ago
Alexander Strizhakov	e33782455d	updates after rebase	4 years ago
Alexander Strizhakov	7dffaef479	tests consistency	4 years ago