djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-10 17:02:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/media
History
Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
..
player.html.haml
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-18 16:14:29 +02:00