Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 22 Sep 2018 03:30:00 +0000 (03:30 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 22 Sep 2018 03:30:00 +0000 (03:30 +0000)
commit7e12ef0ab0cccfde8d46c48f5cc6e4a27f9291c3
treeb4f46ed27466dcceaa012cd5f42e4702f383b6c7
parentec6a7799d8e6b912007b25df9398375f93728b4d
parent56577d8b48fcb8046bf559e683f11045b3e98f51
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