Merge branch 'bugfix/profile-bio-newline' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 23 Mar 2020 19:32:01 +0000 (19:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 31 Mar 2020 10:42:02 +0000 (13:42 +0300)
commite99e2a86afd50c8a7d0f243e1e4017f06ec75441
treee09cc22ff47d7aee9dd91a26d4c3d5aaeafe8535
parentc4d3ccc7b952445069ed3fc8586da14af6db937d
Merge branch 'bugfix/profile-bio-newline' into 'develop'

AccountView: fix for other forms of <br> in bio

Closes #1643

See merge request pleroma/pleroma!2322
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
test/web/mastodon_api/views/account_view_test.exs