diff options
| author | Henry Jameson <me@hjkos.com> | 2020-02-11 10:03:34 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2020-02-11 10:03:34 +0200 |
| commit | 786a695eb6c4399bbbf3fe569cae0623c17b4618 (patch) | |
| tree | 6266845710c0e632cb941ac8bc296778b73ce4f4 /src/components/user_card/user_card.vue | |
| parent | 6f3ac707f76b302e993eeb3eaeb415bc3d68502b (diff) | |
| parent | 8fcb9c42aad9e623287c26244f079fc5028c6359 (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
Diffstat (limited to 'src/components/user_card/user_card.vue')
0 files changed, 0 insertions, 0 deletions