Merge branch 'refactor/locked_user_field' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 14 Oct 2020 16:17:32 +0000 (16:17 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 14 Oct 2020 16:17:32 +0000 (16:17 +0000)
commit9a85ec0da095933cbddfb1dae74d035723032399
treed23745d29bdc0de246b1fefa97eb04947ca971e5
parent481906207e6d803e5c4d3e455c7b93119e392177
parented61002815a65962cd4eba8522f090c2998741d4
Merge branch 'refactor/locked_user_field' into 'develop'

Change user.locked field to user.is_locked

See merge request pleroma/pleroma!3077