diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-10 09:18:05 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-10 09:39:15 +0100 |
| commit | 9765d2b3f8192ff8a8c1bc90faf5f87331a26118 (patch) | |
| tree | 1325b4c03508ebc650af429e23f873b2aa5decde /.gitmodules | |
| parent | ad17e1944aa4c01c5637199b464c9d78b7e54af2 (diff) | |
| parent | aefefc74c468ffd90e3ac97bfed5973717138759 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/environments/production.rb`: Upstream changed headers, and we have different ones. Ported upstream's change.
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions