Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
authorSean King <seanking2919@protonmail.com>
Fri, 6 Aug 2021 14:08:20 +0000 (08:08 -0600)
committerSean King <seanking2919@protonmail.com>
Fri, 6 Aug 2021 14:08:20 +0000 (08:08 -0600)
commit1841bd8383d7734cb74cff91f61dc7e1fdfad13d
tree6da027d9a35687dc592657d026f8413d235b8966
parent9758f636b26477b4695cd2c1ea6f0f5aceca9835
parent5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
CHANGELOG.md
config/config.exs
lib/pleroma/web/router.ex