diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f918.svg | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'public/emoji/1f918.svg')
| -rw-r--r-- | public/emoji/1f918.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f918.svg b/public/emoji/1f918.svg index 71646855c..c3a10630e 100644 --- a/public/emoji/1f918.svg +++ b/public/emoji/1f918.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M25 17.125l-8 .021c-1.104 0-1.875.75-1.875 1.854s.771 1.854 1.875 1.854l5.266.021s.879-.104.879.625c0 .276-.369.625-.646.625 0 0-4.5-.208-4.875 6.875-.015.276-.349.625-.625.625s-.624-.349-.624-.625c0-3.01 1.396-5.938 2.867-6.823-.911 0-1.711-.052-2.242-.052-1 0-1.438-.334-1.438-.333-.146.231-.562 1.271-2.688 1.271-2.375 0-3.021-2.363-3.021-3.021v-5.021L10 15c0-.811.485-1.507 1.18-1.82l-.096 6.654c0 1.104.812 2.083 1.917 2.083.755 0 1.263-.341 1.604-.958-.458-.526-.677-1.133-.677-1.885 0-.886.318-1.795.927-2.344l.042-2.708L15 14c0-.811.485-1.507 1.18-1.82L16.125 15l-.021 1.021c.315-.111.564-.146.917-.146l2.875.021v-2.917L20 13V4c0-.811.485-1.507 1.18-1.82l-.034 13.66h3.646L25 16c.922 0 1.723 2 1.723 2l.002.015c-.244-.419-.757-.89-1.725-.89z"/><path fill="#FFDC5D" d="M15 16.778c-.609.549-1 1.336-1 2.222 0 .753.287 1.433.745 1.959C14.404 21.576 13.755 22 13 22c-1.104 0-2-.896-2-2v-6c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v2.778z"/><path fill="#FFDC5D" d="M6 6c0-1.104.896-2 2-2s2 .896 2 2v14c0 .658.217 1.262.578 1.753.027.037.061.068.089.103.104.129.21.255.332.365.033.027.065.055.1.082.119.099.243.189.377.269.066.039.132.074.201.108.14.069.285.125.435.172.067.021.131.046.2.062.222.052.451.086.688.086.236 0 .461-.036.681-.089.076-.018.148-.042.223-.066.137-.044.269-.099.396-.161.082-.04.163-.076.24-.124.164-.1.318-.213.46-.341.202-.184.384-.387.53-.618l-.003-.003c.2.115.473.402 1.473.402h2.537c-1.809 1.365-3.037 3.99-3.037 7 0 .276.224.5.5.5s.5-.224.5-.5c0-3.859 2.187-7 4.875-7h.125c.276 0 .5-.224.5-.5s-.224-.5-.5-.5H17c-1.104 0-2-.896-2-2s.896-2 2-2h8c.968 0 1.481.596 1.725 1.015.126.217.185.389.188.4L28 22c.103.335.479 1.871.411 2.191C28.411 29 23.715 34 18 34c-6.537 0-12-5.25-12-12 .008.007 0-16 0-16z"/><path fill="#FFDC5D" d="M20 16h-3c-.352 0-.685.072-1 .184V13c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v3zm1 0V3c0-.293.067-.569.18-.82C21.493 1.485 22.189 1 23 1c1.104 0 2 .896 2 2v13h-4z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M18 32.625l-8.146-7.583L11 17c0-.811.485-1.507 1.18-1.82L16 16c0-.811.485-1.507 1.18-1.82l3.716.799L21 15V6c0-.811.485-1.507 1.18-1.82l3.612 13.66L26 18c.922 0 1.723 2 1.723 2l.002.015L18 32.625z"/><g fill="#FFDC5D"><path d="M16 18.778c-.609.549-1 1.336-1 2.222 0 .753.287 1.433.745 1.959C15.404 23.576 14.755 24 14 24c-1.104 0-2-.896-2-2v-6c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v2.778z"/><path d="M7 8c0-1.104.896-2 2-2s2 .896 2 2v14c0 .839.378 1.659.999 2.221 1.168.96 2.843 1.043 4-.002.202-.184.384-.387.53-.618l-.003-.003C16.727 23.713 17 24 18 24h2.537c-1.809 1.365-3.037 3.99-3.037 7 0 .276.224.5.5.5s.5-.224.5-.5c0-3.859 2.187-7 4.875-7 .713.079.847-1 .125-1H18c-1.104 0-2-.896-2-2s.896-2 2-2h8c.968 0 1.481.596 1.725 1.015.126.217.185.389.188.4L29 24c.103.335.479 1.871.411 2.191C29.411 31 24.715 36 19 36c-6.537 0-12-5.25-12-12 .008.007 0-16 0-16z"/><path d="M21 18h-3c-.352 0-.685.072-1 .184V15c0-.293.067-.569.18-.82.313-.695 1.009-1.18 1.82-1.18 1.104 0 2 .896 2 2v3zm1 0V5c0-.293.067-.569.18-.82C22.493 3.485 23.189 3 24 3c1.104 0 2 .896 2 2v13h-4z"/></g></svg> \ No newline at end of file |
