Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

608cc65d

Commit 608cc65d authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/improve-microformats' into 'develop'

improve microformats support

See merge request pleroma/pleroma!672

parents da4b6704 85a5be62

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/formatter.ex 4 additions, 2 deletions

lib/pleroma/formatter.ex
lib/pleroma/html.ex 4 additions, 4 deletions

lib/pleroma/html.ex
test/formatter_test.exs 9 additions, 7 deletions

test/formatter_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 11 additions, 7 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 3 additions, 3 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 2 additions, 2 deletions

test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/views/activity_view_test.exs 4 additions, 2 deletions

test/web/twitter_api/views/activity_view_test.exs

with 37 additions and 27 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