diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f469-1f3ff-200d-1f3ed.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f469-1f3ff-200d-1f3ed.svg')
-rw-r--r-- | public/emoji/1f469-1f3ff-200d-1f3ed.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3ff-200d-1f3ed.svg b/public/emoji/1f469-1f3ff-200d-1f3ed.svg index cde71c216..599992fee 100644 --- a/public/emoji/1f469-1f3ff-200d-1f3ed.svg +++ b/public/emoji/1f469-1f3ff-200d-1f3ed.svg @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath122" clipPathUnits="userSpaceOnUse"><path id="path124" d="M 21.997,36 C 17,36 14.874,34.663 13,32 l 0,0 c -1.992,-2.831 0,-5 -3,-7 l 0,0 c -1.86,-1.24 6,-2.313 12,-2.313 l 0,0 c 6,0 13.861,1.073 12,2.313 l 0,0 c -3,2 -1.008,4.169 -3,7 l 0,0 c -1.874,2.663 -5,4 -9.003,4 z"/></clipPath><clipPath id="clipPath138" clipPathUnits="userSpaceOnUse"><path id="path140" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(35,0)" id="g20"><path id="path22" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(21.9453,30.9307)" id="g24"><path id="path26" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(18,9)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 C 8,0 6.982,-5 4,-5 1.018,-5 0,0 0,0"/></g><path id="path32" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 27,5 17,5 17,9 27,9 27,5 Z"/><g transform="translate(18.3281,8.9824)" id="g34"><path id="path36" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-0.98 3.672,-0.98 0.708,0 2.194,-0.085 3.66,0.98 l 0,3.203 L 0,3.203 0,0 Z"/></g><g transform="translate(18.3223,10.8213)" id="g38"><path id="path40" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.022,-1.155 2.29,-1.468 3.668,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(13.7339,20.2822)" id="g42"><path id="path44" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.564 8.211,10.564 4.534,0 8.209,-4.73 8.209,-10.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(21.9453,12.457)" id="g46"><path id="path48" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(11.7251,17)" id="g50"><path id="path52" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.737,4.051 0.684,0.685 2.052,2.026 2.052,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.719,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,12.207 -10.949,12.207 C 6.115,15.409 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(18.6084,18.1133)" id="g54"><path id="path56" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(25.373,18.1133)" id="g58"><path id="path60" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8359,15.5)" id="g62"><path id="path64" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(15.4443,20.0645)" id="g66"><path id="path68" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g70"><path id="path72" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(23,1.0625)" id="g74"><path id="path76" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,-1.062 -1,1 -1,4 3.5,0 L 0,0 Z"/></g><g transform="translate(14.5,9)" id="g78"><path id="path80" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.068 1.5,-3.662 3.5,-5.798 5.081,-7.485 7.5,-9 7.5,-9 c 0,3.271 -1,4.27 -2,5.338 -1,1.066 -3,1.526 -3,3.662 C 2.5,1.066 0,0 0,0"/></g><g transform="translate(29.5,9)" id="g82"><path id="path84" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.068 -1.5,-3.662 -3.5,-5.798 -5.081,-7.485 -7.5,-9 -7.5,-9 c 0,3.271 1,4.27 2,5.338 1,1.066 3,1.526 3,3.662 0,1.066 2.5,0 2.5,0"/></g><g transform="translate(21,20)" id="g86"><path id="path88" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.07 -1.68,-3.75 -3.75,-3.75 -2.071,0 -3.75,1.68 -3.75,3.75 0,2.071 1.679,3.75 3.75,3.75 C -1.68,3.75 0,2.071 0,0"/></g><g transform="translate(30.5,20)" id="g90"><path id="path92" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.07 -1.68,-3.75 -3.75,-3.75 -2.071,0 -3.75,1.68 -3.75,3.75 0,2.071 1.679,3.75 3.75,3.75 C -1.68,3.75 0,2.071 0,0"/></g><path id="path94" style="fill:#664131;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24.5,18.5 -5,0 0,2.5 5,0 0,-2.5 z"/><g transform="translate(21,20.5)" id="g96"><path id="path98" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.433,-3.5 -7,-1.933 -7,0 -7,1.933 -5.433,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><g transform="translate(30,20.5)" id="g100"><path id="path102" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.933 -1.567,-3.5 -3.5,-3.5 -5.434,-3.5 -7,-1.933 -7,0 -7,1.933 -5.434,3.5 -3.5,3.5 -1.567,3.5 0,1.933 0,0"/></g><path id="path104" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24.5,19.5 -5,0 0,2.5 5,0 0,-2.5 z"/><g transform="translate(20,20.5)" id="g106"><path id="path108" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.38 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.38 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(29,20.5)" id="g110"><path id="path112" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.38 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.38 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(34,25)" id="g114"><path id="path116" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3,2 -1.008,4.169 -3,7 -1.874,2.663 -5,4 -9.003,4 C -17,11 -19.126,9.663 -21,7 c -1.992,-2.831 0,-5 -3,-7 -1.861,-1.24 6,-2.313 12,-2.313 6,0 13.861,1.073 12,2.313"/></g></g></g><g id="g118"><g clip-path="url(#clipPath122)" id="g120"><g transform="translate(20,24.5)" id="g126"><path id="path128" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 c -3.604,0 -10.687,1.035 -12.724,2.053 l 0.448,0.894 C -10.983,2.05 -4.591,1.093 -1,1.006 L -1,11.5 0,11.5 0,0 Z"/></g><g transform="translate(24.5,24.5)" id="g130"><path id="path132" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 0,11.5 1,0 0,-10.495 c 4.011,0.078 9.996,1.052 11.776,1.942 L 12.724,2.053 C 10.551,0.966 3.799,0 0,0"/></g></g></g><g id="g134"><g clip-path="url(#clipPath138)" id="g136"><g transform="translate(5,12)" id="g142"><path id="path144" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,-1 c 0,0 1.5,-2.5 1.5,-6 l 0,-5 2,0 0,5 C 2,-2.5 0,0 0,0"/></g><g transform="translate(6.0791,12.1934)" id="g146"><path id="path148" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.208,-0.379 0.071,-0.855 -0.307,-1.064 l -2.131,-1.178 c -0.378,-0.208 -0.854,-0.071 -1.064,0.308 l -0.451,0.817 c -0.209,0.379 -0.072,0.855 0.307,1.064 l 2.13,1.178 c 0.379,0.209 0.855,0.071 1.064,-0.309 L 0,0 Z"/></g><g transform="translate(3.4897,13.416)" id="g150"><path id="path152" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.187,2.209 -3.438,6.271 -3.438,6.271 0,0 -0.749,-8.48 3.438,-6.271"/></g><g transform="translate(2.9604,14.6348)" id="g154"><path id="path156" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.202,1.162 -1.808,3.299 -1.808,3.299 -1.808,3.299 -2.202,-1.16 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#3B88C3" d="M35 36v-3.5c0-3.314-3.685-5.5-7-5.5H16c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#292F33" d="M22 35.999L16 27h12z"/><path fill="#55ACEE" d="M14.5 27c0 1.068 1.5 3.662 3.5 5.798C19.581 34.485 22 36 22 36c0-3.271-1-4.27-2-5.338-1-1.066-3-1.526-3-3.662 0-1.066-2.5 0-2.5 0m15 0c0 1.068-1.5 3.662-3.5 5.798C24.419 34.485 22 36 22 36c0-3.271 1-4.27 2-5.338 1-1.066 3-1.526 3-3.662 0-1.066 2.5 0 2.5 0"/><path fill="#0B0200" d="M21.945 5.069c4.105 0 10.947 2.053 10.947 10.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-10.947 10.949-10.947"/><path fill="#7C533E" d="M18.328 27.018c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-3.203h-7.332v3.203z"/><path fill="#664131" d="M18.322 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#7C533E" d="M13.734 15.718c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M21.945 23.543c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#3D2E24" d="M22.836 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.191.423-.424.423"/><path fill="#0B0200" d="M11.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.022-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.895-6.842-12.207-10.948-12.207-4.104 0-10.947 3.257-10.947 12.152 0 .793-.02 1.257.008 3.257h.719z"/><path fill="#7C533E" d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623"/><circle fill="#664131" cx="17.25" cy="16" r="3.75"/><circle fill="#664131" cx="26.75" cy="16" r="3.75"/><path fill="#664131" d="M19.5 15h5v2.5h-5z"/><circle fill="#E1E8ED" cx="17.5" cy="15.5" r="3.5"/><circle fill="#E1E8ED" cx="26.5" cy="15.5" r="3.5"/><path fill="#E1E8ED" d="M19.5 14h5v2.5h-5z"/><circle fill="#292F33" cx="17.5" cy="15.5" r="2.5"/><circle fill="#292F33" cx="26.5" cy="15.5" r="2.5"/><path fill="#66757F" d="M5 24l-1.5 1S5 27.5 5 31v5h2v-5c0-4.5-2-7-2-7z"/><path fill="#99AAB5" d="M6.079 23.807c.208.379.071.854-.307 1.064l-2.13 1.178c-.379.208-.855.07-1.064-.309l-.451-.816c-.208-.379-.072-.855.307-1.064l2.13-1.178c.378-.209.855-.071 1.064.309l.451.816z"/><path fill="#F4900C" d="M3.49 22.584C7.678 20.375.052 16.313.052 16.313s-.75 8.48 3.438 6.271z"/><path fill="#FFDC5D" d="M2.96 21.365c2.202-1.162-1.808-3.299-1.808-3.299s-.394 4.459 1.808 3.299z"/><path fill="#3B88C3" d="M34 11c-3-2-1.008-4.169-3-7-1.874-2.663-5-4-9.003-4C17 0 14.874 1.337 13 4c-1.992 2.831 0 5-3 7-1.861 1.24 6 2.313 12 2.313S35.861 12.24 34 11"/><path fill="#269" d="M20 11.5V.088c-.35.032-.683.074-1 .124v10.281c-2.09-.05-5.124-.396-7.653-.853-.174.297-.41.59-.73.877 2.911.565 6.596.982 8.883.982h.5zm4.5 0c2.421 0 6.037-.393 8.907-.959-.325-.288-.563-.58-.741-.877-2.431.448-5.371.787-7.667.832V.292c-.323-.066-.66-.112-1-.155V11.5h.501z"/></svg> \ No newline at end of file |