Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

fbf02a37

Commit fbf02a37 authored 5 years ago by rinpatch

Downloads
- Plain Diff

Merge branch 'bugfix/profile-bio-newline' into 'develop'

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

Closes #1643

See merge request !2322

parents d931a590 15be6ba9

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/mastodon_api/views/account_view.ex 1 addition, 1 deletion

lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs 2 additions, 2 deletions

...ontrollers/account_controller/update_credentials_test.exs
test/web/mastodon_api/views/account_view_test.exs 4 additions, 3 deletions

test/web/mastodon_api/views/account_view_test.exs

with 7 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment