diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
| commit | 9a3d91f629ae0e8f722d56b8634bfad299ab9f04 (patch) | |
| tree | 324a2b04d34049d7f31a041d6a44b23d45a46e6b /.prettierignore | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | b59fb28e90bc21d6fd1a6bafd13cfbd81ab5be54 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
Diffstat (limited to '.prettierignore')
0 files changed, 0 insertions, 0 deletions