Merge branch 'fix/rich-media-disable-in-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 31 Jan 2019 16:22:26 +0000 (16:22 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 31 Jan 2019 16:22:26 +0000 (16:22 +0000)
commitfb9730010e794a7f80c94b4320fd0591f2e7c93c
tree90a2a6499cddfed17d203d6af11b46a3b9dad36a
parentbd89cdbe318ce12e0273163a51f2907e6e763be6
parent7057891db649e1a72abfda13418d8c4bddd4ec92
Merge branch 'fix/rich-media-disable-in-config' into 'develop'

Make rich media support toggleable

See merge request pleroma/pleroma!748