diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-10 19:09:27 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-10 19:09:27 +0100 |
| commit | f1a6f9062e00c0651680bf4d5d750ec0b078ac5a (patch) | |
| tree | 30d40f0b5df56e955f80a91ae3b44090bd918ed9 /Dockerfile | |
| parent | d602c92b310545eb733a58caed49717341abe27c (diff) | |
| parent | 3dc1e3cfc3928ce709c3e60e98ecbd1edd6e2a7d (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.
Diffstat (limited to 'Dockerfile')
0 files changed, 0 insertions, 0 deletions