5 Commits

Author	SHA1	Message	Date
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Alexander Strizhakov	6bf85440b3	mix tasks consistency	2020-10-13 16:33:24 +03:00