Merge branch 'develop' into 'fix/2412-filters'
authorfeld <feld@feld.me>
Wed, 3 Feb 2021 14:23:23 +0000 (14:23 +0000)
committerfeld <feld@feld.me>
Wed, 3 Feb 2021 14:23:23 +0000 (14:23 +0000)
commit008499f65a33f5d42a98cc3719f6ab5e8def40d6
tree1bcf258f38105267d4f655d8aed68d1ab502523f
parent39335d42513e47289fc825d04680531b84862686
parentc3dd860a027ef1339285b5b62dc62e0b48bc6855
Merge branch 'develop' into 'fix/2412-filters'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
config/config.exs
lib/pleroma/web/api_spec/operations/filter_operation.ex
test/support/factory.ex