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

bf5aaefb

Commit bf5aaefb authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'fix/html-cache-content-collision' into 'develop'

Different caches based on the module. Remove scrubber version since it is not relevant anymore

See merge request pleroma/pleroma!628

parents 4258dd86 1e2d5898

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/html.ex 10 additions, 25 deletions

lib/pleroma/html.ex
lib/pleroma/web/mastodon_api/views/status_view.ex 5 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/twitter_api/views/activity_view.ex 6 additions, 2 deletions

lib/pleroma/web/twitter_api/views/activity_view.ex

with 21 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