Merge branch 'features/users-raw_bio' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Wed, 17 Jun 2020 10:34:23 +0000 (10:34 +0000)
committerrinpatch <rinpatch@sdf.org>
Wed, 17 Jun 2020 10:34:23 +0000 (10:34 +0000)
User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326

1  2 
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/support/factory.ex
test/web/mastodon_api/views/account_view_test.exs

Simple merge
Simple merge