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/1f3a1.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/1f3a1.svg')
-rw-r--r-- | public/emoji/1f3a1.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3a1.svg b/public/emoji/1f3a1.svg index 70b23f1e4..c35744ab8 100644 --- a/public/emoji/1f3a1.svg +++ b/public/emoji/1f3a1.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,4)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(18,9)" id="g24"><path id="path26" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.076,0 -11,4.925 -11,11 0,6.075 4.924,11 11,11 C 6.075,22 11,17.075 11,11 11,4.925 6.075,0 0,0 M -0.001,24 C -7.18,24 -13,18.18 -13,11 -13,3.82 -7.18,-2 -0.001,-2 7.18,-2 13,3.82 13,11 13,18.18 7.18,24 -0.001,24"/></g><g transform="translate(21,29.5)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(12,26.5)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(30,26.5)" id="g36"><path id="path38" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(33,17.5)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(9,17.5)" id="g44"><path id="path46" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(12,9.5)" id="g48"><path id="path50" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(30,9.5)" id="g52"><path id="path54" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(21,5.5)" id="g56"><path id="path58" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.381 -1.119,-2.5 -2.5,-2.5 l -1,0 c -1.381,0 -2.5,1.119 -2.5,2.5 0,1.381 1.119,2.5 2.5,2.5 l 1,0 C -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(20.9492,6)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.659,2 -5.667,1.142 -5.899,0 L 0,0 Z"/></g><g transform="translate(11.9492,10)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.659,2 -5.667,1.142 -5.899,0 L 0,0 Z"/></g><g transform="translate(8.9492,18)" id="g68"><path id="path70" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.659,2 -5.667,1.142 -5.899,0 L 0,0 Z"/></g><g transform="translate(32.9492,18)" id="g72"><path id="path74" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.658,2 -5.667,1.142 -5.898,0 L 0,0 Z"/></g><g transform="translate(29.9492,10)" id="g76"><path id="path78" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.658,2 -5.667,1.142 -5.898,0 L 0,0 Z"/></g><g transform="translate(29.9492,27)" id="g80"><path id="path82" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.658,2 -5.667,1.142 -5.898,0 L 0,0 Z"/></g><g transform="translate(20.9492,30)" id="g84"><path id="path86" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.659,2 -5.667,1.142 -5.899,0 L 0,0 Z"/></g><g transform="translate(11.9492,27)" id="g88"><path id="path90" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.231,1.142 -1.239,2 -2.449,2 l -1,0 C -4.659,2 -5.667,1.142 -5.899,0 L 0,0 Z"/></g><g transform="translate(26.001,2)" id="g92"><path id="path94" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.376,0 -0.735,0.212 -0.906,0.574 L -8.001,15.651 -15.097,0.574 c -0.236,-0.5 -0.831,-0.713 -1.33,-0.479 -0.5,0.235 -0.715,0.831 -0.479,1.331 l 8,17 c 0.165,0.35 0.518,0.574 0.905,0.574 0.387,0 0.74,-0.224 0.905,-0.574 l 8,-17 C 1.139,0.926 0.925,0.33 0.425,0.095 0.287,0.03 0.143,0 0,0"/></g><g transform="translate(14.9995,20)" id="g96"><path id="path98" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.657 1.343,3 3,3 4.657,3 6.001,1.657 6.001,0 6.001,-1.657 4.657,-3 3,-3 1.343,-3 0,-1.657 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M30.806 15.347H19.201l8.205-8.205-.707-.707-8.205 8.205V3.036h-1V14.64L9.288 6.435l-.707.707 8.206 8.205H5.182v1h11.605l-8.206 8.206.707.707 8.206-8.206v11.605h1V17.055l8.205 8.205.707-.707-8.205-8.206h11.605z"/><path fill="#AAB8C2" d="M17.994 1.394c-7.982 0-14.453 6.471-14.453 14.453 0 7.982 6.471 14.453 14.453 14.453 7.983 0 14.454-6.471 14.454-14.453-.001-7.982-6.472-14.453-14.454-14.453zm0 26.683c-6.755 0-12.23-5.475-12.23-12.23s5.475-12.23 12.23-12.23c6.754 0 12.23 5.475 12.23 12.23s-5.475 12.23-12.23 12.23z"/><path fill="#AAB8C2" d="M17.993 23.374c-4.15 0-7.526-3.377-7.526-7.527s3.376-7.526 7.526-7.526c4.151 0 7.528 3.376 7.528 7.526s-3.376 7.527-7.528 7.527zm0-13.553c-3.323 0-6.026 2.704-6.026 6.026s2.704 6.027 6.026 6.027c3.324 0 6.028-2.704 6.028-6.027s-2.704-6.026-6.028-6.026z"/><path fill="#8899A6" d="M27.279 34.429l-8.376-18.344c-.021-.046-.058-.076-.085-.117-.038-.059-.072-.118-.123-.169-.051-.051-.11-.085-.17-.123-.041-.027-.071-.064-.117-.085-.012-.005-.024-.003-.035-.008-.064-.027-.132-.034-.201-.047-.061-.011-.121-.03-.182-.03-.054 0-.106.018-.161.027-.075.013-.149.022-.219.051-.011.005-.023.003-.034.008-.044.02-.074.057-.114.082-.061.039-.121.074-.173.125-.051.051-.086.111-.124.171-.026.04-.063.07-.083.115L8.709 34.429c-.229.502-.008 1.096.494 1.325.135.061.276.09.415.09.379 0 .742-.217.91-.585l7.465-16.351 7.465 16.351c.168.368.531.585.911.585.139 0 .279-.029.414-.091.504-.229.725-.822.496-1.324z"/><path d="M12.9 36H7.079c-.552 0-1-.447-1-1s.448-1 1-1H12.9c.552 0 1 .447 1 1s-.448 1-1 1zm15.999 0h-5.82c-.553 0-1-.447-1-1s.447-1 1-1h5.82c.553 0 1 .447 1 1s-.447 1-1 1z" fill="#553788"/><path fill="#744EAA" d="M21.284 29.819c0 1.535-1.244 2.779-2.779 2.779h-1.112c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.534 0 2.779 1.244 2.779 2.779z"/><path fill="#CBB7EA" d="M21.227 29.263c-.257-1.269-1.378-2.224-2.723-2.224h-1.112c-1.345 0-2.466.954-2.724 2.224h6.559z"/><path fill="#5C913B" d="M11.017 26.527c0 1.535-1.244 2.779-2.779 2.779H7.126c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535 0 2.779 1.244 2.779 2.779z"/><path fill="#C6E5B3" d="M10.96 25.971c-.257-1.269-1.378-2.224-2.723-2.224H7.126c-1.345 0-2.466.954-2.724 2.224h6.558z"/><path fill="#3B94D9" d="M34.977 17.633c0 1.535-1.244 2.779-2.779 2.779h-1.112c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535-.001 2.779 1.243 2.779 2.779z"/><path fill="#BBDDF5" d="M34.921 17.077c-.257-1.269-1.378-2.224-2.723-2.224h-1.112c-1.344 0-2.466.954-2.723 2.224h6.558z"/><path fill="#5C913B" d="M31.644 7.887c0 1.535-1.244 2.779-2.779 2.779h-1.112c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535 0 2.779 1.244 2.779 2.779z"/><path fill="#C6E5B3" d="M31.588 7.331c-.257-1.269-1.378-2.224-2.723-2.224h-1.112c-1.344 0-2.466.954-2.723 2.224h6.558z"/><path fill="#BE1931" d="M31.644 26.527c0 1.535-1.244 2.779-2.779 2.779h-1.112c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535 0 2.779 1.244 2.779 2.779z"/><path fill="#F4ABBA" d="M31.588 25.971c-.257-1.269-1.378-2.224-2.723-2.224h-1.112c-1.344 0-2.466.954-2.723 2.224h6.558z"/><path fill="#BE1931" d="M11.017 7.887c0 1.535-1.244 2.779-2.779 2.779H7.126c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535 0 2.779 1.244 2.779 2.779z"/><path fill="#F4ABBA" d="M10.96 7.331c-.257-1.269-1.378-2.224-2.723-2.224H7.126c-1.345 0-2.466.954-2.724 2.224h6.558z"/><path fill="#744EAA" d="M21.284 2.876c0 1.535-1.244 2.779-2.779 2.779h-1.112c-1.535 0-2.779-1.244-2.779-2.779S15.858.097 17.393.097h1.112c1.534-.001 2.779 1.243 2.779 2.779z"/><path fill="#CBB7EA" d="M21.227 2.32C20.97 1.051 19.849.096 18.504.096h-1.112c-1.345 0-2.466.954-2.724 2.224h6.559z"/><path fill="#3B94D9" d="M7.682 17.633c0 1.535-1.244 2.779-2.779 2.779H3.79c-1.535 0-2.779-1.244-2.779-2.779s1.244-2.779 2.779-2.779h1.112c1.535-.001 2.78 1.243 2.78 2.779z"/><path fill="#BBDDF5" d="M7.625 17.077c-.257-1.269-1.378-2.224-2.723-2.224H3.79c-1.345 0-2.466.954-2.724 2.224h6.559z"/><path fill="#553788" d="M14.952 15.847c0-1.68 1.362-3.041 3.041-3.041 1.68 0 3.042 1.362 3.042 3.041s-1.362 3.041-3.042 3.041c-1.679.001-3.041-1.361-3.041-3.041z"/></svg> \ No newline at end of file |