11 commits

Author	SHA1	Message	Date
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	2020-10-29 23:39:15 +00:00
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	2020-10-27 12:51:31 -05:00
Egor Kislitsyn	ad605e3e16	Rename Pleroma.Backup to Pleroma.User.Backup	2020-10-20 17:16:58 +04:00
Egor Kislitsyn	c1976d5b19	Fix credo warnings	2020-10-19 18:14:49 +04: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
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	7acf09beb8	more tests	2020-10-13 16:38:18 +03:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00