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

6b54a3ec

Commit 6b54a3ec authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'multiple-hackney-pools' into 'develop'

Fix 4aff4efa typos

See merge request !743

parents 45d22269 5ea0397e

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/application.ex 1 addition, 1 deletion

lib/pleroma/application.ex
lib/pleroma/web/rich_media/parser.ex 1 addition, 1 deletion

lib/pleroma/web/rich_media/parser.ex
lib/pleroma/web/rich_media/parsers/oembed_parser.ex 1 addition, 1 deletion

lib/pleroma/web/rich_media/parsers/oembed_parser.ex

with 3 additions and 3 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