diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-19 10:42:55 +0100 |
| commit | 7452a959989f1259b68d08814437bab53ee89bb0 (patch) | |
| tree | 389c2be7b7a326729e4687019a58950a07bd2dde /config/initializers/oj.rb | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | fef6c59b3abe349132dbe910b6aa243e59b732bb (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
Diffstat (limited to 'config/initializers/oj.rb')
0 files changed, 0 insertions, 0 deletions