diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /public/emoji/1fad8.svg | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'public/emoji/1fad8.svg')
| -rwxr-xr-x | public/emoji/1fad8.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1fad8.svg b/public/emoji/1fad8.svg new file mode 100755 index 000000000..5e9325d6d --- /dev/null +++ b/public/emoji/1fad8.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#CA694D" d="M13.822 8.247a4.5 4.5 0 0 0-6.15 1.635c-1.002 1.728-.527 1.859-2.096 4.564-1.577 2.719-1.91 2.342-2.921 4.086a4.5 4.5 0 0 0 1.635 6.15c6.573 3.814 16.419-12.44 9.532-16.435z"/><path fill="#AE3D2F" d="M15.379 9.751c1.727 5.969-6.111 16.911-11.629 13.71a4.446 4.446 0 0 1-1.557-1.544 4.48 4.48 0 0 0 2.096 2.765c5.923 3.436 14.519-9.428 11.09-14.931z"/><path fill="#F6CFB2" d="M5.827 17.248c-.69-.4-.278-.764.614-2.3.891-1.537 1.002-2.075 1.692-1.675 1.138.66-1.168 4.636-2.306 3.975z"/><path fill="#CA694D" d="M29.548 25.956a4.5 4.5 0 0 0-5.422-3.332c-1.943.464-1.71.899-4.753 1.625-3.057.73-3.013.229-4.974.697a4.5 4.5 0 0 0-3.332 5.422c1.765 7.393 20.33 3.332 18.481-4.412z"/><path fill="#AE3D2F" d="M11.375 31.211c2.734 5.749 17.477 2.722 18.259-3.655-2.465 4.882-13.99 7.144-18.259 3.655z"/><path fill="#F6CFB2" d="M17.516 26.362c-.185-.776.362-.727 2.09-1.14 1.728-.413 2.194-.703 2.38.073.305 1.28-4.165 2.347-4.47 1.067z"/><path fill="#CA694D" d="M29.45 19.482a4.5 4.5 0 0 0 2.029-6.032c-.889-1.789-1.26-1.465-2.651-4.266-1.398-2.815-.9-2.885-1.796-4.69A4.501 4.501 0 0 0 21 2.464c-6.808 3.381 1.319 20.559 8.45 17.018z"/><path fill="#AE3D2F" d="M29.88 18.153c-5.679 2.82-12.073-7.574-10.857-13.637-2.662 5.65 4.289 18.013 10.426 14.966a4.49 4.49 0 0 0 2.441-3.357 4.452 4.452 0 0 1-2.01 2.028z"/><path fill="#F6CFB2" d="M26.352 7.848c.715-.355.79.19 1.58 1.781s1.178 1.98.464 2.335c-1.179.585-3.223-3.531-2.044-4.116z"/></svg> \ No newline at end of file |