diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 09:36:47 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 09:36:47 +0100 |
| commit | c118918520c3c5b1d60451e9692c45f7bd7e32e4 (patch) | |
| tree | d192e63c8f2599c44189fbb3bc33b481e22fe28b /.browserslistrc | |
| parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
| parent | 8fdbb4d00d371e7a900bec3a262216d95a784d52 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.
Diffstat (limited to '.browserslistrc')
0 files changed, 0 insertions, 0 deletions