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/1f934-1f3ff.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/1f934-1f3ff.svg')
| -rw-r--r-- | public/emoji/1f934-1f3ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f934-1f3ff.svg b/public/emoji/1f934-1f3ff.svg index 0cb9a1b7e..ad40c9d54 100644 --- a/public/emoji/1f934-1f3ff.svg +++ b/public/emoji/1f934-1f3ff.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M32 20c0-2.209-1.119-4-2.5-4-.012 0-.021.005-.033.005C27.955 9.704 23.394 5.125 18 5.125s-9.956 4.58-11.467 10.88C6.521 16.004 6.511 16 6.5 16 5.119 16 4 17.791 4 20c0 2.107 1.021 3.815 2.314 3.97C7.537 30.619 12.299 35 18 35c5.7 0 10.463-4.381 11.685-11.03C30.979 23.815 32 22.107 32 20z"/><path d="M13 21c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z"/><path fill="#3D2E24" d="M18 31c-4.201 0-5.491-1.077-5.707-1.293-.391-.391-.391-1.023 0-1.414.378-.379.984-.39 1.376-.036.08.058 1.1.743 4.331.743 3.355 0 4.326-.739 4.336-.747.39-.389 1.001-.37 1.393.021.391.391.369 1.043-.021 1.434C23.491 29.923 22.201 31 18 31zm1-5h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#0B0200" d="M18 1c8 0 13 6 13 11s-1 7-2 5l-2-4s-6 0-8-2c0 0 3 6-3 0 0 0 1 4-5-1 0 0-3 2-4 7-.277 1.387-2 0-2-5S9 1 18 1z"/><g fill="#99AAB5"><path d="M28.55 8.4L25.875 3l-2.429 4.189L17.969.5l-5.493 6.689L9.992 3 6.946 8.4 5.5 6.25V9.5h25V6.25z"/><path d="M30.5 10h-25c-.276 0-.5-.224-.5-.5V6.25c0-.22.144-.414.354-.478.21-.067.438.017.561.199l.994 1.478 2.648-4.694c.088-.156.251-.253.43-.255.195.019.344.092.436.245l2.12 3.576L17.584.183c.093-.116.235-.183.385-.183.149 0 .292.067.386.183l5.021 6.131 2.066-3.565c.093-.16.254-.262.449-.249.184.006.35.112.432.277l2.349 4.743 1.458-1.606c.139-.153.357-.206.55-.13.193.074.32.259.32.466V9.5c0 .276-.224.5-.5.5zM6 9h24V7.545l-1.08 1.19c-.11.123-.27.186-.439.159-.163-.023-.306-.125-.379-.273l-2.261-4.565-1.962 3.384c-.082.142-.229.234-.393.248-.165.012-.322-.055-.426-.182l-5.091-6.218-5.106 6.218c-.103.126-.264.193-.424.181-.163-.012-.309-.104-.392-.244l-2.042-3.446-2.623 4.649c-.086.15-.243.247-.416.253-.175.013-.337-.077-.435-.22L6 7.889V9z"/></g><path fill="#E1E8ED" d="M18 3l-2 2v2l2 2 2-2V5zm-7 3l-1 1.415L9 6l1-1.414zm16 0l-1 1.415L25 6l1-1.414z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M32 20c0-2.209-1.119-4-2.5-4-.012 0-.021.005-.033.005C27.955 9.704 23.394 5.125 18 5.125s-9.956 4.58-11.467 10.88C6.521 16.004 6.511 16 6.5 16 5.119 16 4 17.791 4 20c0 2.107 1.021 3.815 2.314 3.97C7.537 30.619 12.299 35 18 35c5.7 0 10.463-4.381 11.685-11.03C30.979 23.815 32 22.107 32 20z"/><path d="M13 21c-.552 0-1-.447-1-1v-2c0-.552.448-1 1-1s1 .448 1 1v2c0 .553-.448 1-1 1zm10 0c-.553 0-1-.447-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2c0 .553-.447 1-1 1z"/><path fill="#3D2E24" d="M18 31c-4.201 0-5.491-1.077-5.707-1.293-.391-.391-.391-1.023 0-1.414.378-.379.984-.39 1.376-.036.08.058 1.1.743 4.331.743 3.355 0 4.326-.739 4.336-.747.39-.389 1.001-.37 1.393.021.391.391.369 1.043-.021 1.434C23.491 29.923 22.201 31 18 31zm1-5h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/><path fill="#0B0200" d="M18 1c8 0 13 6 13 11s-1 7-2 5l-2-4s-6 0-8-2c0 0 3 6-3 0 0 0 1 4-5-1 0 0-3 2-4 7-.277 1.387-2 0-2-5S9 1 18 1z"/><path fill="#99AAB5" d="M30.68 5.784c-.192-.075-.411-.022-.55.13L28.672 7.52l-2.349-4.743c-.082-.165-.248-.271-.432-.277-.195-.013-.356.089-.449.249l-2.066 3.565L18.355.183C18.261.067 18.119 0 17.969 0c-.149 0-.292.067-.386.183l-5.041 6.138-2.12-3.576c-.091-.153-.24-.227-.436-.245-.179.002-.342.099-.43.254L6.909 7.449l-.994-1.478c-.123-.182-.351-.266-.561-.199-.21.064-.354.258-.354.478V9.5c0 .276.224.5.5.5h25c.276 0 .5-.224.5-.5V6.25c0-.207-.127-.392-.32-.466z"/><path fill="#E1E8ED" d="M18 3l-2 2v2l2 2 2-2V5zm-7 3l-1 1.415L9 6l1-1.414zm16 0l-1 1.415L25 6l1-1.414z"/></svg> \ No newline at end of file |
