From: kaniini <nenolod@gmail.com>
Date: Sat, 22 Sep 2018 03:30:00 +0000 (+0000)
Subject: Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=7e12ef0ab0cccfde8d46c48f5cc6e4a27f9291c3;p=akkoma

Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'

twitter api: add no_rich_text option to userview for account prefs

See merge request pleroma/pleroma!355
---

7e12ef0ab0cccfde8d46c48f5cc6e4a27f9291c3