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/1f1ed-1f1f2.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/1f1ed-1f1f2.svg')
-rw-r--r-- | public/emoji/1f1ed-1f1f2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ed-1f1f2.svg b/public/emoji/1f1ed-1f1f2.svg index 986705ff9..989da76df 100644 --- a/public/emoji/1f1ed-1f1f2.svg +++ b/public/emoji/1f1ed-1f1f2.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="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" d="M 4,31 C 1.791,31 0,29.209 0,27 l 0,0 0,-9 19,0 0,13 -15,0 z"/></clipPath><clipPath id="clipPath96" clipPathUnits="userSpaceOnUse"><path id="path98" 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,9)" id="g20"><path id="path22" style="fill:#00247d;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,18 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(9.0005,9.9766)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.222,-1.129 0.121,1.66 -1.646,0.251 1.373,0.941 L -2.202,3.165 -0.611,2.678 0,4.227 0.611,2.678 2.203,3.165 1.373,1.723 2.747,0.782 1.101,0.531 1.223,-1.129 0,0 Z"/></g><g transform="translate(27.9502,26.438)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.799,-0.738 -0.72,0.348 -1.797,0.512 -0.898,1.127 -1.44,2.071 -0.4,1.752 0,2.765 0.4,1.752 1.441,2.071 0.898,1.127 1.797,0.512 0.721,0.348 0.8,-0.738 0,0 Z"/></g><g transform="translate(23.9502,20.4375)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.799,-0.738 -0.72,0.348 -1.797,0.512 -0.898,1.127 -1.44,2.071 -0.4,1.752 0,2.766 0.4,1.752 1.441,2.071 0.898,1.127 1.797,0.512 0.721,0.348 0.8,-0.738 0,0 Z"/></g><g transform="translate(32.9502,22.4375)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.799,-0.738 -0.72,0.348 -1.797,0.512 -0.898,1.127 -1.44,2.071 -0.4,1.752 0,2.766 0.4,1.752 1.441,2.071 0.898,1.127 1.797,0.512 0.721,0.348 0.8,-0.738 0,0 Z"/></g><g transform="translate(27.9502,8.4375)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.799,-0.738 -0.72,0.348 -1.797,0.512 -0.898,1.127 -1.44,2.071 -0.4,1.752 0,2.766 0.4,1.752 1.441,2.071 0.898,1.127 1.797,0.512 0.721,0.348 0.8,-0.738 0,0 Z"/></g><g transform="translate(31,20)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.294,-0.596 0.951,-0.691 0.476,-1.154 0.588,-1.809 0,-1.5 l -0.588,-0.309 0.112,0.655 -0.475,0.463 0.657,0.095 L 0,0 Z"/></g><g transform="translate(19,31)" id="g48"><path id="path50" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 19,0 0,13 z"/></g><g transform="translate(19,18)" id="g52"><path id="path54" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.029 -7.1,7 -12.329,7 -2.332,0 0,0 Z"/></g><g transform="translate(19,19.418)" id="g56"><path id="path58" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.971,5.582 -1.743,0 L 0,-1.22 0,0 Z"/></g><g transform="translate(8.0996,25)" id="g60"><path id="path62" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.1,-5.766 -8.1,-7 -4.768,-7 5.23,0 0,0 Z"/></g><g transform="translate(10.7139,25)" id="g64"><path id="path66" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.98,-7 0.266,0 1.461,0 L 1.744,0 0,0 Z"/></g><g transform="translate(16.6689,31)" id="g68"><path id="path70" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 5.229,0 7.099,4.971 L 2.331,0 0,0 Z"/></g><g transform="translate(17.5391,31)" id="g72"><path id="path74" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.996,-7 1.743,0 9.714,6.802 L 1.461,0 0,0 Z"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(10,24)" id="g84"><path id="path86" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.328,0 -6.668,7 -9,7 -9.625,5.406 0,-1.331 0,0 Z"/></g><g transform="translate(10,24)" id="g88"><path id="path90" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.714,0 -9,6.802 -9.5,5.937 0,-0.722 0,0 Z"/></g></g></g><g id="g92"><g clip-path="url(#clipPath96)" id="g94"><g transform="translate(19,27)" id="g100"><path id="path102" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 0,4 -5,0 0,-4 -7,0 0,-5 7,0 0,-4 5,0 0,4 7,0 0,5 z"/></g><path id="path104" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,18 -3,0 0,13 3,0 0,-13 z"/><path id="path106" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,23 -19,0 0,3 19,0 0,-3 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#00247D" d="M32 5H4c-.205 0-.407.015-.604.045l-.004 1.754-2.73-.004C.244 7.427 0 8.185 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path d="M9 26.023l-1.222 1.129.121-1.66-1.645-.251 1.373-.94-.829-1.443 1.591.488L9 21.797l.612 1.549 1.591-.488-.83 1.443 1.374.94-1.645.251.121 1.66zM27.95 9.562l-.799.738.079-1.086-1.077-.164.899-.615-.542-.944 1.04.319.4-1.013.401 1.013 1.041-.319-.543.944.898.615-1.076.164.079 1.086zm-4 6l-.799.739.079-1.086-1.077-.164.899-.616-.542-.944 1.04.319.4-1.013.401 1.013 1.041-.319-.543.944.898.616-1.076.164.079 1.086zm9-2l-.799.739.079-1.086-1.077-.164.899-.616-.542-.944 1.04.319.4-1.013.401 1.013 1.041-.319-.543.944.898.616-1.076.164.079 1.086zm-5 14l-.799.739.079-1.086-1.077-.164.899-.616-.542-.944 1.04.319.4-1.013.401 1.013 1.041-.319-.543.944.898.616-1.076.164.079 1.086zM31 16l.294.596.657.095-.475.463.112.655L31 17.5l-.588.309.112-.655-.475-.463.657-.095z" fill="#FFF"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/></svg> \ No newline at end of file |