diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 18:06:29 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 18:06:29 +0100 |
| commit | 954e052b0727099be97552af577831a8a0f81a88 (patch) | |
| tree | 560526b10076fdfa31245fe8bfdd4a58303ae214 /app/views/media/player.html.haml | |
| parent | e0d94323bc8f6c5d249452e2baf1f103c15546b8 (diff) | |
| parent | 166f6e4b500dd84eeffdbf887b2dc21e6d8c0aa6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.
Diffstat (limited to 'app/views/media/player.html.haml')
0 files changed, 0 insertions, 0 deletions