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/1f3c2-1f3fe.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/1f3c2-1f3fe.svg')
-rw-r--r-- | public/emoji/1f3c2-1f3fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3c2-1f3fe.svg b/public/emoji/1f3c2-1f3fe.svg index 076c81b98..972c7348b 100644 --- a/public/emoji/1f3c2-1f3fe.svg +++ b/public/emoji/1f3c2-1f3fe.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></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(36,20)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-16 c 0,0 0,-4 -4,-4 l -28,0 c -4,0 -4,4 -4,4 l 0,2 c 0,0 17,10 36,14"/></g><g transform="translate(32.8164,15.0195)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.462,-1.003 0.023,-2.19 -0.98,-2.653 L -24.596,-13.53 c -1.003,-0.462 -2.19,-0.024 -2.652,0.979 l -0.837,1.818 c -0.462,1.003 -0.023,2.191 0.98,2.653 L -3.49,2.797 c 1.004,0.462 2.191,0.022 2.654,-0.98 L 0,0 Z"/></g><g transform="translate(25.4063,10)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.3,0 -0.605,0.067 -0.893,0.211 l -2,1 c -0.438,0.22 -0.78,0.592 -0.962,1.046 l -1.682,4.204 -4.204,1.682 c -1.026,0.41 -1.525,1.574 -1.114,2.6 0.409,1.026 1.575,1.525 2.599,1.114 l 5.001,-2 c 0.508,-0.203 0.91,-0.606 1.114,-1.114 l 1.717,-4.294 1.32,-0.66 C 1.885,3.295 2.285,2.094 1.791,1.105 1.44,0.404 0.734,0 0,0"/></g><g transform="translate(16.4092,6)" id="g32"><path id="path34" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.733,-0.001 -1.44,0.404 -1.79,1.105 l -1,2 c -0.199,0.398 -0.26,0.851 -0.172,1.288 l 0.848,4.241 -2.602,4.337 c -0.569,0.947 -0.262,2.175 0.686,2.744 0.946,0.569 2.175,0.261 2.743,-0.686 l 3,-5 C 1.97,9.602 2.057,9.096 1.96,8.607 L 1.094,4.28 1.788,2.895 C 2.281,1.906 1.881,0.705 0.893,0.211 0.606,0.067 0.301,0 0,0"/></g><g transform="translate(24.4082,20)" id="g36"><path id="path38" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.888,0 -7.231,4.309 -7.6,4.8 -0.663,0.884 -0.483,2.137 0.4,2.8 0.883,0.662 2.135,0.485 2.798,-0.397 C -3.396,5.873 -1.365,4 0,4 1.104,4 2,3.105 2,2 2,0.896 1.104,0 0,0"/></g><g transform="translate(7.4077,15.999)" id="g40"><path id="path42" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.837,0 -1.618,0.53 -1.897,1.368 -1.058,3.175 -0.442,6.121 1.733,8.297 1.539,1.54 3.332,2.167 3.532,2.234 1.046,0.348 2.181,-0.217 2.53,-1.266 C 6.246,9.589 5.685,8.461 4.644,8.107 3.681,7.77 0.648,6.381 1.898,2.633 2.247,1.586 1.681,0.453 0.633,0.104 0.423,0.033 0.21,0 0,0"/></g><g transform="translate(18.4082,20.5)" id="g44"><path id="path46" style="fill:#67757f;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 l 0,4 c 0,1.933 1.567,3.5 3.5,3.5 C -1.567,7.5 0,5.933 0,4 L 0,0 Z"/></g><g transform="translate(20.4082,26)" id="g48"><path id="path50" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 l -7,0 c -1.105,0 -2,0.896 -2,2 0,1.105 0.895,2 2,2 l 7,0 C -0.896,2 0,1.105 0,0"/></g><g transform="translate(11,17.5)" id="g52"><path id="path54" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.101,0 -0.2,0.03 -0.285,0.089 -0.419,0.183 -0.5,0.336 -0.5,0.5 l 0,7 C -0.5,10 2.208,10 4,10 5.792,10 8.5,10 8.5,7.5 l 0,-4 C 8.5,3.292 8.371,3.105 8.176,3.032 l -8,-3 C 0.119,0.01 0.059,0 0,0"/></g><g transform="translate(31.4746,32.1582)" id="g56"><path id="path58" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1,3 c -0.068,0.204 -0.26,0.342 -0.475,0.342 -0.129,0 -3.213,-0.035 -7.299,-3.1 -3.868,-2.901 -4.756,-2.901 -6.701,-2.901 l -3,10e-4 c -0.132,0 -0.259,-0.053 -0.353,-0.147 -0.527,-0.527 -0.666,-1.268 -0.371,-1.982 0.375,-0.904 1.55,-1.871 3.724,-1.871 1.439,0 3.533,1.156 5.957,2.493 2.979,1.644 6.355,3.507 9.043,3.507 0.162,0 0.312,0.077 0.406,0.207 C 0.025,-0.32 0.051,-0.152 0,0"/></g><g transform="translate(18.4082,32)" id="g60"><path id="path62" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,3 4,3 2.209,0 4,-0.791 4,-3"/></g><g transform="translate(12,32)" id="g64"><path id="path66" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2,0 4,1 4,0 4,-1 4,-3 6,-3 8,-3 9,4 3,4 -3,4 -3,0 0,0"/></g><g transform="translate(13,31.5)" id="g68"><path id="path70" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(11.5,32.5)" id="g72"><path id="path74" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.551,0 -1,-0.449 -1,-1 0,-0.551 0.449,-1 1,-1 0.551,0 1,0.449 1,1 0,0.551 -0.449,1 -1,1 m 0,-3 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 C 1.103,1 2,0.103 2,-1 2,-2.103 1.103,-3 0,-3"/></g><g transform="translate(16,31.5)" id="g76"><path id="path78" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(14.5,32.5)" id="g80"><path id="path82" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.551,0 -1,-0.449 -1,-1 0,-0.551 0.449,-1 1,-1 0.551,0 1,0.449 1,1 0,0.551 -0.449,1 -1,1 m 0,-3 c -1.103,0 -2,0.897 -2,2 0,1.103 0.897,2 2,2 C 1.103,1 2,0.103 2,-1 2,-2.103 1.103,-3 0,-3"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M36 16v16s0 4-4 4H4c-4 0-4-4-4-4v-2s17-10 36-14z"/><path fill="#EA596E" d="M32.816 20.98c.462 1.003.023 2.19-.98 2.653L8.221 34.511c-1.003.462-2.19.023-2.652-.979l-.837-1.817c-.462-1.003-.023-2.191.979-2.653l23.615-10.877c1.004-.462 2.191-.022 2.654.979l.836 1.816z"/><path fill="#67757F" d="M25.406 26c-.3 0-.605-.067-.893-.211l-2-1c-.439-.22-.78-.592-.963-1.046l-1.682-4.204-4.204-1.682c-1.025-.41-1.524-1.574-1.114-2.6.41-1.026 1.576-1.525 2.6-1.114l5.001 2c.508.203.91.606 1.114 1.114l1.717 4.294 1.32.66c.988.494 1.389 1.695.895 2.684-.35.701-1.056 1.105-1.791 1.105z"/><path fill="#67757F" d="M16.409 30c-.733.001-1.44-.404-1.791-1.105l-1-2c-.199-.397-.259-.851-.172-1.287l.848-4.241-2.602-4.337c-.568-.947-.261-2.175.686-2.744.946-.569 2.175-.261 2.744.686l3 4.999c.256.427.344.934.246 1.422l-.865 4.327.693 1.386c.494.988.093 2.189-.895 2.684-.286.143-.591.21-.892.21z"/><path fill="#BBDDF5" d="M24.408 16c-3.888 0-7.231-4.309-7.6-4.8-.663-.884-.483-2.138.4-2.8.883-.662 2.135-.484 2.798.397C21.012 10.127 23.043 12 24.408 12c1.104 0 2 .896 2 2s-.895 2-2 2zm-17 4.001c-.837 0-1.618-.53-1.897-1.368-1.058-3.175-.442-6.121 1.733-8.297 1.539-1.54 3.332-2.167 3.532-2.233 1.046-.348 2.181.216 2.53 1.265.348 1.044-.213 2.172-1.254 2.526-.963.337-3.996 1.726-2.746 5.474.349 1.048-.217 2.18-1.265 2.53-.21.07-.423.103-.633.103z"/><path fill="#67757F" d="M18.408 15.5c0 1.933-1.567 3.5-3.5 3.5s-3.5-1.567-3.5-3.5v-4c0-1.933 1.567-3.5 3.5-3.5s3.5 1.567 3.5 3.5v4z"/><path fill="#BBDDF5" d="M20.408 10c0 1.104-.896 2-2 2h-7c-1.104 0-2-.896-2-2s.896-2 2-2h7c1.105 0 2 .896 2 2z"/><path fill="#BBDDF5" d="M11 18.5c-.101 0-.2-.03-.285-.089-.134-.094-.215-.247-.215-.411v-7c0-2.5 2.708-2.5 4.5-2.5s4.5 0 4.5 2.5v4c0 .208-.129.395-.324.468l-8 3c-.057.022-.117.032-.176.032z"/><path fill="#1C6399" d="M31.475 3.842l-1-3C30.406.638 30.215.5 30 .5c-.129 0-3.214.035-7.3 3.1-3.867 2.9-4.755 2.9-6.7 2.9h-3c-.133 0-.26.053-.354.147-.527.527-.666 1.268-.371 1.982.376.904 1.551 1.871 3.725 1.871 1.438 0 3.532-1.156 5.957-2.494C24.935 6.363 28.312 4.5 31 4.5c.161 0 .312-.077.405-.207.095-.131.12-.299.07-.451z"/><path fill="#AF7E57" d="M18.408 4c0 2.209-1.791 4-4 4s-4-1.791-4-4 1.791-3 4-3 4 .791 4 3z"/><path fill="#9AAAB4" d="M12 4c2 0 4-1 4 0s0 3 2 3 3-7-3-7-6 4-3 4z"/><circle fill="#BDDDF4" cx="11.5" cy="4.5" r="1.5"/><path fill="#67757F" d="M11.5 6.5c-1.103 0-2-.897-2-2s.897-2 2-2 2 .897 2 2-.897 2-2 2zm0-3c-.551 0-1 .449-1 1s.449 1 1 1 1-.449 1-1-.449-1-1-1z"/><circle fill="#BDDDF4" cx="14.5" cy="4.5" r="1.5"/><path fill="#67757F" d="M14.5 6.5c-1.103 0-2-.897-2-2s.897-2 2-2 2 .897 2 2-.897 2-2 2zm0-3c-.551 0-1 .449-1 1s.449 1 1 1 1-.449 1-1-.449-1-1-1z"/></svg> \ No newline at end of file |