diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-04 19:15:50 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-04 19:15:50 +0200 |
| commit | c85c3fb708078e1576edbd4d71495ccabc35504d (patch) | |
| tree | 8c7ede7d8a7d847e247fb45c73a888492ac029d4 /.gitattributes | |
| parent | 58ac5ae643dc57ffd20017c54e7be523deaef156 (diff) | |
| parent | 8c644dcbd9bada5b5ad00a2c3d94fb46a4e77cb4 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js`
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions