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/1fac5-1f3fd.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/1fac5-1f3fd.svg')
| -rwxr-xr-x | public/emoji/1fac5-1f3fd.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1fac5-1f3fd.svg b/public/emoji/1fac5-1f3fd.svg new file mode 100755 index 000000000..096506f2f --- /dev/null +++ b/public/emoji/1fac5-1f3fd.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#963B22" d="M33.197 16.27c.232-6.284-3.454-11.043-10.086-13.189-2.638-.853-8.844-.621-10.395 1.396-4.034.078-8.766 3.724-9.387 8.534-.614 4.76.754 6.971 1.241 10.551.552 4.056 2.832 5.353 4.655 5.896 2.623 3.465 5.411 3.317 10.092 3.317 9.141 0 13.495-6.116 13.88-16.505z"/><path fill="#D4AB88" d="M28.339 16.713c-.884-1.225-2.017-2.211-4.499-2.56.931.427 1.823 1.901 1.939 2.715.116.815.233 1.474-.504.659-2.952-3.263-6.167-1.978-9.354-3.972-2.226-1.392-2.903-2.933-2.903-2.933s-.272 2.056-3.646 4.15c-.978.607-2.145 1.959-2.793 3.956-.465 1.435-.321 2.715-.321 4.903 0 6.385 5.262 11.753 11.753 11.753s11.753-5.415 11.753-11.753c0-3.97-.416-5.521-1.425-6.918z"/><path fill="#C1694F" d="M18 32c-2.347 0-3.575-1.16-3.707-1.293a.999.999 0 0 1 1.404-1.424c.051.047.806.717 2.303.717 1.519 0 2.273-.69 2.305-.719a1.008 1.008 0 0 1 1.408.029.994.994 0 0 1-.006 1.397C21.575 30.84 20.347 32 18 32zm1-5h-2a1 1 0 1 1 0-2h2a1 1 0 1 1 0 2z"/><path fill="#662113" d="M13 23a1 1 0 0 1-1-1v-2a1 1 0 0 1 2 0v2a1 1 0 0 1-1 1zm10 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1z"/><path fill="#A0AAB1" d="M30.5 8a.5.5 0 0 0 .5-.5v-.544L28.672 5.52l-2.921-3.203a.502.502 0 0 0-.711-.028l-2.164 2.026L18.653.354A.991.991 0 0 0 18 .083a.995.995 0 0 0-.653.27l-4.223 3.961-2.164-2.026a.498.498 0 0 0-.711.028L7.328 5.52 5 6.956V7.5a.5.5 0 0 0 .5.5h25z"/><path fill="#E9EDF0" d="m16 4 2-2 2 2-2 2zM9 5.5 10.5 4l1.499 1.5-1.5 1.5zm15 0L25.5 4l1.499 1.5-1.5 1.5z"/></svg> \ No newline at end of file |