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

5075e8ab

Commit 5075e8ab authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'bugfix/tesla-safety' into 'develop'

tesla hardening

Closes #712 and #672

See merge request pleroma/pleroma!912

parents 46200d8f 1f78d23e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/http/connection.ex 7 additions, 3 deletions

lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex 23 additions, 22 deletions

lib/pleroma/http/http.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 0 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/rel_me.ex 0 additions, 1 deletion

lib/pleroma/web/rel_me.ex
lib/pleroma/web/rich_media/parser.ex 0 additions, 1 deletion

lib/pleroma/web/rich_media/parser.ex

with 30 additions and 28 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