mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 14:45:12 +01:00
Code Issues Projects Releases Wiki Activity
9,703 Commits 134 Branches 269 Tags 907 MiB
ddd875ad99
Commit Graph

2 Commits

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
 2019-06-19 18:36:16 +02:00
Eugen Rochko
103a9f4466
Fix sanitizer making block level elements unreadable (#10836) 
Fix #10834
 2019-06-16 21:46:36 +02:00