Commit Graph

2 Commits (22f1ec1b1e54a42a6ecf598135fd2da1d512642f)

Author SHA1 Message Date
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
6 years ago
Eugen Rochko 103a9f4466
Fix sanitizer making block level elements unreadable (#10836)
Fix #10834
6 years ago