Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 07:41:09 +0000 (07:41 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 19 Apr 2018 07:41:09 +0000 (07:41 +0000)
commite4da81d6629e138d5e1519c081d44a9ed0481ac7
tree3957a24efa14131f99792ba553c0f15cf83b6369
parentb586ead6b815897e1993c4977aeafa0338a3945b
parentee6f15529d0bf0404452bb8ae54f878f54881d5d
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'

CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120