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

60980702

Commit 60980702 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'bugfix/osada-mention' into 'develop'

fix osada mentions

Closes #324

See merge request pleroma/pleroma!380

parents c7140c67 958c5e02

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/formatter.ex 6 additions, 1 deletion

lib/pleroma/formatter.ex
test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json 54 additions, 0 deletions

...poison_mock/https___osada.macgirvin.com_channel_mike.json
test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json 53 additions, 0 deletions

test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json
test/formatter_test.exs 19 additions, 0 deletions

test/formatter_test.exs
test/support/httpoison_mock.ex 21 additions, 0 deletions

test/support/httpoison_mock.ex

with 153 additions and 1 deletion

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