Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
authorWilliam Pitcock <nenolod@dereferenced.org>
Sun, 2 Sep 2018 00:14:25 +0000 (00:14 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Fri, 5 Oct 2018 20:49:34 +0000 (20:49 +0000)
commitb1be9415effadf81e557eddee3f60bdf0fa359af
treeb307cd06e023c68977f39736fc8aaecf89a9bc5f
parentf7ba393bb94f29bb79bc34ff3c708f929f61cc57
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"

This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing
changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
lib/pleroma/formatter.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex
mix.exs
mix.lock
test/web/common_api/common_api_test.exs