Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
authorFloatingGhost <hannah@coffee-and-dreams.uk>
Sat, 8 Jan 2022 21:45:12 +0000 (21:45 +0000)
committerFloatingGhost <hannah@coffee-and-dreams.uk>
Sat, 8 Jan 2022 21:45:12 +0000 (21:45 +0000)
commit0f6bece60dd433ec39082748700911ed9b69e630
tree417633562ce44573831e9f3919464973e4e2ae6f
parent8cc6359a853c37282fa0ba951549048e10623bdf
parent0d012ebea1dc21617c9c96b75bbf5d37aa4f0f8a
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
config/config.exs
lib/pleroma/user.ex