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/1f477-1f3ff-200d-2640-fe0f.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/1f477-1f3ff-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f477-1f3ff-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f477-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f477-1f3ff-200d-2640-fe0f.svg index 6e9b84dfa..23c567e24 100644 --- a/public/emoji/1f477-1f3ff-200d-2640-fe0f.svg +++ b/public/emoji/1f477-1f3ff-200d-2640-fe0f.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="clipPath70" clipPathUnits="userSpaceOnUse"><path id="path72" d="M 0,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath90" clipPathUnits="userSpaceOnUse"><path id="path92" d="M 12,9 C 8.687,9 5,6.815 5,3.5 L 5,3.5 5,0 31,0 31,3.5 C 31,6.815 27.314,9 24,9 l 0,0 -12,0 z"/></clipPath><clipPath id="clipPath102" clipPathUnits="userSpaceOnUse"><path id="path104" d="M 0,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath118" clipPathUnits="userSpaceOnUse"><path id="path120" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath130" clipPathUnits="userSpaceOnUse"><path id="path132" d="M 17.997,36 C 13,36 10.874,34.663 9,32 l 0,0 C 7.007,29.169 9,27 6,25 l 0,0 c -1.861,-1.24 6,-2.313 12,-2.313 l 0,0 c 6,0 13.86,1.073 12,2.313 l 0,0 c -3,2 -1.007,4.169 -3,7 l 0,0 c -1.874,2.663 -5,4 -9.003,4 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(31,0)" id="g20"><path id="path22" style="fill:#f2760f;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(17.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(14,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 23,5 13,5 13,9 23,9 23,5 Z"/><g transform="translate(14.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(14.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(9.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(17.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(7.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.005,2 0.005,1.924 0.005,3.202 0,8.895 -6.841,12.207 -10.948,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(14.6084,18.1133)" id="g54"><path id="path56" style="fill:#000000;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(21.373,18.1133)" id="g58"><path id="path60" style="fill:#000000;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(18.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></g><g id="g66"><g clip-path="url(#clipPath70)" id="g68"><g transform="translate(11.4443,20.0645)" id="g74"><path id="path76" 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(27.833,20.0645)" id="g78"><path id="path80" 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(19,1.0625)" id="g82"><path id="path84" 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></g><g id="g86"><g clip-path="url(#clipPath90)" id="g88"><path id="path94" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -3,0 0,9 3,0 0,-9 z"/><path id="path96" style="fill:#fff75f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 12,0 9,0 9,9 12,9 12,0 Z"/></g></g><g id="g98"><g clip-path="url(#clipPath102)" id="g100"><g transform="translate(10.5,9)" id="g106"><path id="path108" 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(25.5,9)" id="g110"><path id="path112" 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></g><g id="g114"><g clip-path="url(#clipPath118)" id="g116"><g transform="translate(30,25)" id="g122"><path id="path124" style="fill:#fff75f;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="g126"><g clip-path="url(#clipPath130)" id="g128"><g transform="translate(16,24.5)" id="g134"><path id="path136" style="fill:#ffac33;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 -0.247,0.123 -0.347,0.424 -0.223,0.671 0.124,0.247 0.424,0.346 0.671,0.223 C -10.983,2.05 -4.591,1.093 -1,1.006 L -1,11.5 C -1,11.776 -0.776,12 -0.5,12 -0.224,12 0,11.776 0,11.5 L 0,0 Z"/></g><g transform="translate(20.5,24.5)" id="g138"><path id="path140" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 0,11.5 c 0,0.276 0.224,0.5 0.5,0.5 0.276,0 0.5,-0.224 0.5,-0.5 L 0.5,1.004 C 5.042,1.076 14.513,2.065 16.276,2.947 16.524,3.069 16.823,2.971 16.947,2.724 17.07,2.477 16.971,2.176 16.724,2.053 14.603,0.993 3.941,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F2760F" d="M31 36v-3.5c0-3.314-3.685-5.5-7-5.5H12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#0B0200" d="M17.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="#292F33" d="M14 27h8s-1.018 5-4 5-4-5-4-5"/><path fill="#292F33" d="M13 27h10v4H13z"/><path fill="#7C533E" d="M14.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="M14.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="M9.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="M17.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="#0B0200" d="M7.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-.023-.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 d="M14.608 17.887c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#3D2E24" d="M18.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="#7C533E" d="M11.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"/><path fill="#292F33" d="M19 34.938l-1 1.061-1-1L16 31h3.5z"/><path fill="#FFF75F" d="M24 27h3v9h-3zM9 27h3v9H9z"/><path fill="#55ACEE" d="M10.5 27c0 1.068 1.5 3.662 3.5 5.798C15.581 34.485 18 36 18 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.798C20.419 34.485 18 36 18 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="#FFF75F" d="M30 11c-3-2-1.008-4.169-3-7-1.873-2.663-5-4-9.002-4C13 0 10.874 1.337 9 4c-1.992 2.831 0 5-3 7-1.861 1.24 6 2.313 12 2.313S31.861 12.24 30 11"/><path fill="#FFAC33" d="M16 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.91.566 6.596.983 8.883.983h.5zm12.855-1.553c-2.853.304-5.839.517-7.855.549V.292c-.323-.066-.66-.112-1-.155V11.5h.5c2.018 0 5.796-.261 9.289-.657-.402-.295-.708-.593-.934-.896z"/></svg> \ No newline at end of file |