Merge branch 'develop' into issue/1934-welcome-email
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 23 Jul 2020 13:36:27 +0000 (16:36 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 23 Jul 2020 13:36:27 +0000 (16:36 +0300)
commit67ab9a792868ea4ef38ecd59abb6b193140eaf10
treed744f1baa74b3b7b6ef08bfd97af5fdd6671c949
parent7991ddad582537f34b4964125195961e596b8687
parent76aa49a0c5be0d1d51e99fd30683b12c8edc653d
Merge branch 'develop' into issue/1934-welcome-email
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/application_requirements.ex
lib/pleroma/user.ex
test/application_requirements_test.exs
test/user_test.exs