diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
| commit | b368c7502931aa06121ecad8a97193b1f17cf90a (patch) | |
| tree | 2b598363926388d30a4c5c6197436b46f6d4610a /public/emoji/1f482-200d-2640-fe0f.svg | |
| parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
| parent | dd4c156f33a24b8bb89b45b2697aa4036c3ae5be (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.
Diffstat (limited to 'public/emoji/1f482-200d-2640-fe0f.svg')
0 files changed, 0 insertions, 0 deletions