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/1faf0-1f3fb.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/1faf0-1f3fb.svg')
| -rwxr-xr-x | public/emoji/1faf0-1f3fb.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1faf0-1f3fb.svg b/public/emoji/1faf0-1f3fb.svg new file mode 100755 index 000000000..6abb81eab --- /dev/null +++ b/public/emoji/1faf0-1f3fb.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#F7DECE" d="M29.5 19.519a5.077 5.077 0 0 0-3.409-4.077L15.1 11.167l3-7.62A2.227 2.227 0 0 0 16.458.456a2.903 2.903 0 0 0-2.571.8 39.35 39.35 0 0 0-2.903 3.783c-.927-.832-3.895-3.18-6.625-1.847-2.858 1.396 2.166 6.234 3.518 7.466-2.533 5.799-2.905 11.183-2.116 14.923.8 3.8 2.279 4.8 5.685 6.816a22.929 22.929 0 0 0 12.675 3.283 5.782 5.782 0 0 0 5.643-5.338c.28-3.607.191-7.234-.264-10.823z"/><path fill="#E0AA94" d="M25.6 15.249a.984.984 0 0 0-.03.253 48.02 48.02 0 0 1-.405 8.389 1 1 0 0 0 1.988.215c.328-2.587.482-5.193.46-7.8a6.11 6.11 0 0 0-1.516-.865l-.497-.192zm-5.34-1.718a45.247 45.247 0 0 1-.8 9.011 1 1 0 1 0 1.959.4 46.97 46.97 0 0 0 .848-8.994l-1.949-.748a.981.981 0 0 0-.058.331zM13.749 22.4h.051a1 1 0 0 0 1-.952 22.85 22.85 0 0 1 2.174-9.548l-1.874-.733a24.873 24.873 0 0 0-2.3 10.188 1 1 0 0 0 .949 1.045zM9.37 3.843a37.42 37.42 0 0 0-3.031 5.311 29.337 29.337 0 0 0 1.537 1.505 35.182 35.182 0 0 1 3.098-5.606 10.858 10.858 0 0 0-1.604-1.21z"/></svg> \ No newline at end of file |