mirror
/
glitch-soc
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
glitch-soc/app/views/media
History
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 		2024-09-06 19:25:31 +02:00
..
player.html.haml Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 2024-09-06 19:25:31 +02:00