5 commits

Author	SHA1	Message	Date
Maksim Pechnikov	20e68b30f0	added generated pleroma.env	2020-10-15 22:28:26 +03:00
Mark Felder	09be8cb336	Credo	2020-10-13 12:49:43 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Alexander Strizhakov	b081080dd9	fixes after rebase	2020-10-13 16:44:02 +03:00
Alexander Strizhakov	6bf85440b3	mix tasks consistency	2020-10-13 16:33:24 +03:00