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/1fac4-1f3ff.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/1fac4-1f3ff.svg')
| -rwxr-xr-x | public/emoji/1fac4-1f3ff.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1fac4-1f3ff.svg b/public/emoji/1fac4-1f3ff.svg new file mode 100755 index 000000000..8565a9a00 --- /dev/null +++ b/public/emoji/1fac4-1f3ff.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FA743E" d="m29.902 20.444-5.185-5.403a3.312 3.312 0 0 0-2.593-1.263H17.27a3.333 3.333 0 0 0-3.305 2.898L13 24l.015.13A7.4 7.4 0 0 0 13.263 36H25v-8.639c2.017-1.395 4.299-3.011 4.902-3.584 1.897-1.805 0-3.333 0-3.333zm-4.445 1.112v-.002.002z"/><path fill="#DD551F" d="m24.999 27.362-.001 1.309-3.94 2.674-2.641-4.139 5.645-5.81-1.939-1.923.501-.751 2.834 2.833-6.054 5.89 2.222 2.222s1.582-1.066 3.373-2.305zm-7.422-5.737c-.782 0-1.536.115-2.254.317a6.312 6.312 0 0 1-.078-.942c0-1.932.834-3.311 1.607-3.48l-.214-.977c-1.387.304-2.393 2.179-2.393 4.457 0 .435.049.856.122 1.267a8.348 8.348 0 0 0-5.137 7.705c0 2.372.994 4.508 2.584 6.028h1.449a7.405 7.405 0 0 1-3.105-6.028 7.418 7.418 0 0 1 7.419-7.419c.414 0 .817.043 1.213.109v-.936a8.225 8.225 0 0 0-1.213-.101z"/><path fill="#664131" d="M20.331 27.532c-1.124-.535-2.19-.461-3.221.142-.493.289-.694.829.061 1.008.758.177 3.16-1.15 3.16-1.15z"/><path fill="#7C533E" d="M21.845 29.449c.139 1.765-2.226 3.414-4.02 3.199-1.282-.154-2.398-3.608-.877-4.053 1.356-.396 1.731-1.628 3.34-1.168 1.278.366 1.506 1.344 1.557 2.022z"/><path fill="#583529" d="m20.659 30.132-.212-.441s-.771 1.147-1.843 1.59c-.813.332-1.498.365-1.857.306.154.293.157.343.359.53 1.117.039 2.902-.56 3.553-1.985zm-2.217-.039c.99-.678 1.279-1.326 1.279-1.326l-.323-.409s-1.145 1.776-3.177 1.685c.015.248-.005.296.068.55.273.009 1.349.05 2.153-.5z"/><path fill="#7C533E" d="m11.647 6.297 1.832 4.41c1.008 2.424 2.382 4.16 4.803 3.165l.082.326c.206.817.055 1.478 1.258 1.524.841.032 1.977-1.47 1.771-2.287l-.41-1.636c1.203-1.435 1.921-3.269 1.304-4.751l-1.02-2.457c-5.514 2.076-7.783-.773-7.783-.773l-1.837 2.479z"/><path fill="#0B0200" d="M17.568.414c-1.943 0-3.934 1.111-4.968 2.511-2.24.001-2.461 2.004-2.237 2.758.665 2.24 4.064.359 6.514 3.15 0 0-.337-1.073.163-2.138.861 2.538 2.743 1.061 4.002 4.63C24.444 10 25.919.414 17.568.414z"/><path fill="#3D2E24" d="m14.342 11.782-.308.128a.265.265 0 1 1-.204-.489l.309-.128a.265.265 0 1 1 .203.489z"/><path d="M14.493 9.711a.53.53 0 0 1-.692-.286l-.205-.491a.53.53 0 0 1 .98-.407l.204.49a.53.53 0 0 1-.287.694z"/><path fill="#3D2E24" d="M16.116 12.096c-.284.258-.724.622-1.266.989.189.216.39.402.604.558.511-.357.923-.704 1.2-.956a.4.4 0 1 0-.538-.591z"/></svg> \ No newline at end of file |