diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 10:06:11 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 10:06:11 +0200 |
| commit | abfdafef1ededdb87f018414edd6b25fa9a70525 (patch) | |
| tree | 7a9855d79d125333a6b1307215b73dd507475320 /streaming | |
| parent | f30c5e7f15f967019245d2c78f3c2e89800eb838 (diff) | |
| parent | 4db8230194258a9a1c3d17d7261608515f3f2067 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
Diffstat (limited to 'streaming')
0 files changed, 0 insertions, 0 deletions