Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'

CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120

lib/pleroma/web/common_api/utils.ex

@@ -61,6 +61,7 @@ def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
 
   def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
     status
+    |> String.replace("\r", "")
     |> format_input(mentions, tags)
     |> maybe_add_attachments(attachments, no_attachment_links)
   end