diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 14:16:25 +0100 |
| commit | 6c20dad201efdfaec59c37ce3f3ca4c7702b5274 (patch) | |
| tree | b1df234db04b93b7d0c241d120019f03368850f4 /public/emoji/1f468-1f3fd-200d-1f3ed.svg | |
| parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
| parent | 18d00055f4f7e28a9a4cc81d3159072e9beb779d (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
Diffstat (limited to 'public/emoji/1f468-1f3fd-200d-1f3ed.svg')
0 files changed, 0 insertions, 0 deletions