Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma-fe
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

786a695e

Commit 786a695e authored 5 years ago by HJ

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into themes-accent

* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields

parents 6f3ac707 8fcb9c42

No related branches found

No related tags found

Loading

Pipeline #22729 passed 5 years ago

Stage: lint

Stage: build

Stage: test

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
package.json 1 addition, 0 deletions

package.json
src/components/attachment/attachment.js 8 additions, 3 deletions

src/components/attachment/attachment.js
src/services/entity_normalizer/entity_normalizer.service.js 4 additions, 2 deletions

src/services/entity_normalizer/entity_normalizer.service.js
yarn.lock 2 additions, 1 deletion

yarn.lock

with 16 additions and 6 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