Merge branch 'rich_media_parsers_configurable' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 09:53:42 +0000 (09:53 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 14 Jul 2019 09:53:42 +0000 (09:53 +0000)
commit9f211838eca3793bac8bbb6b64f200a8a6c8d29f
treea2c642689f00da2b13069b258f8571f48126db18
parent592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e
parent7af27c143d6c6f288be1e7d2fd2e2e9a439ececf
Merge branch 'rich_media_parsers_configurable' into 'develop'

parsers configurable

See merge request pleroma/pleroma!1400