Merge branch 'fix/fake-filters' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 19 Sep 2018 03:53:25 +0000 (03:53 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 19 Sep 2018 03:53:25 +0000 (03:53 +0000)
commit47c9b972b9ef5133f588fdcdc4eeda00888d269e
tree3df4c6075ccd66f6c5e3778eb3946752d9916b63
parent22c366a85f2a41c1344b863446491c866c47a8a4
parentf4fcea5258a5dbffdf8929887251c64e32c2fd3e
Merge branch 'fix/fake-filters' into 'develop'

Revert "Mastodon API: Fake support for loading filters"

See merge request pleroma/pleroma!348