diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
| commit | 32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch) | |
| tree | 117e952f835329eadc0095e809427f7af5be9631 /public/emoji/1f330.svg | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | b59ce0a60ff4f90bb16a8c3338ad37218af052b8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.
Diffstat (limited to 'public/emoji/1f330.svg')
0 files changed, 0 insertions, 0 deletions