Merge branch 'fix/missing-config-settings' into 'develop'
authorfeld <feld@feld.me>
Sat, 22 Feb 2020 15:35:33 +0000 (15:35 +0000)
committerfeld <feld@feld.me>
Sat, 22 Feb 2020 15:35:33 +0000 (15:35 +0000)
commit1961a680ec8fb333fa34a7b102820388c9cf5aa6
tree948934fff4030bbf6bb4bb83dcc83c4afa234511
parent114e7b764ed5ae03211cca40e7b19f33292b3d1c
parent9fe60c3b9c242621177cb8c182f4e23a2ada14e7
Merge branch 'fix/missing-config-settings' into 'develop'

Add missing invites_enabled and account_activation_required settings

See merge request pleroma/pleroma!2234