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/1f3dc.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/1f3dc.svg')
-rw-r--r-- | public/emoji/1f3dc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3dc.svg b/public/emoji/1f3dc.svg index 5dd33f2b9..99baa8d00 100644 --- a/public/emoji/1f3dc.svg +++ b/public/emoji/1f3dc.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,36 C 4,36 0,36 0,32 L 0,32 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,28 c 0,0 0,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,17.072 0,4 C 0,0 4,0 4,0 l 0,0 28,0 c 4,0 4,4 4,4 l 0,0 0,11 -8,0 c -1.418,0 -7.792,5 -9,5 l 0,0 c -1,0 -4,-2 -5,-2 l 0,0 c -2,0 -4.348,4 -6,4 l 0,0 C 6.215,22 2.849,18.384 0,17.072"/></clipPath><clipPath id="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" 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,0 0,-4 -4,-4 l -28,0 c 0,0 -4,0 -4,4 l 0,28 c 0,4 4,4 4,4 l 28,0 c 4,0 4,-4 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(8,22)" id="g32"><path id="path34" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.653,0 4,-4 6,-4 1,0 4,2 5,2 1.208,0 7.582,-5 9,-5 l 8,0 c 2.004,0 0,-21 0,-21 l -36,0 c 0,0 -7.454,21.096 -1,22.709 C -5.982,-4.537 -2,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(-1.9585,15)" id="g44"><path id="path46" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 37.999,0 0.959,-20 -38,0 L 0,0 Z"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(31.5,21.4653)" id="g56"><path id="path58" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.398,0 -2.5,-1.135 -2.5,-2.535 l 0,-5.782 c 0,-0.687 -1,-1.241 -1,-1.551 l 0,10.601 c 0,2.1 -1.9,3.802 -4,3.802 -2.1,0 -4,-1.702 -4,-3.802 l 0,-13.171 c -1,0.301 -1,0.869 -1,1.587 l 0,3.247 c 0,1.4 -1.101,2.535 -2.5,2.535 -1.399,0 -2.5,-1.135 -2.5,-2.535 l 0,-4.436 c 0,-1.399 0.94,-2.455 1.971,-3.048 0.787,-0.455 3.029,-1.014 4.029,-1.047 l 0,-2.33 c 0,-2 8,-2 8,0 l 0,4.873 c 1,0.075 3.185,0.603 3.937,1.038 1.03,0.594 2.063,1.649 2.063,3.05 l 0,6.969 C 2.5,-1.135 1.4,0 0,0"/></g><g transform="translate(20.6035,20.1982)" id="g60"><path id="path62" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.633,-0.634 -0.35,0 -0.635,0.284 -0.635,0.634 0,0.35 0.285,0.633 0.635,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(27.5742,24.0991)" id="g64"><path id="path66" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(26.3066,18.2969)" id="g68"><path id="path70" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.633,0.284 -0.633,0.634 0,0.351 0.284,0.634 0.633,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(21.8711,13.8613)" id="g72"><path id="path74" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(25.6729,11.3271)" id="g76"><path id="path78" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.35 0.285,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(21.2373,7.5254)" id="g80"><path id="path82" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.633,0.283 -0.633,0.634 0,0.35 0.284,0.634 0.633,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(16.1685,6.8916)" id="g84"><path id="path86" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.284,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.283 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.284,0.634 0,0.35 0,0"/></g><g transform="translate(18.7031,11.3271)" id="g88"><path id="path90" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.283 -0.634,0.634 0,0.35 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.35 0,0"/></g><g transform="translate(14.2671,12.5947)" id="g92"><path id="path94" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.633,-0.634 -0.351,0 -0.634,0.283 -0.634,0.634 0,0.35 0.283,0.633 0.634,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(34.5439,18.9307)" id="g96"><path id="path98" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.351 0.285,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(30.7422,17.0303)" id="g100"><path id="path102" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.351 -0.283,-0.634 -0.634,-0.634 -0.349,0 -0.634,0.283 -0.634,0.634 0,0.35 0.285,0.633 0.634,0.633 C -0.283,0.633 0,0.35 0,0"/></g><g transform="translate(33.2764,13.8613)" id="g104"><path id="path106" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.633,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(31.376,8.792)" id="g108"><path id="path110" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.633 -0.634,-0.633 -0.35,0 -0.634,0.283 -0.634,0.633 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(26.9404,4.9902)" id="g112"><path id="path114" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.35 -0.283,-0.634 -0.634,-0.634 -0.35,0 -0.634,0.284 -0.634,0.634 0,0.351 0.284,0.634 0.634,0.634 C -0.283,0.634 0,0.351 0,0"/></g><g transform="translate(17,29)" id="g116"><path id="path118" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -2.238,-5 -5,-5 -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5"/></g><g transform="translate(16,29)" id="g120"><path id="path122" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.79,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.21,0 4,-1.791 4,-4"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M20.417 22.732c-.21-.087-1.776-.732-2.709-.732-2 0-4.68-4-6.333-4-2.667 0-4.62 5.225-6.375 6.042-1.445.673-2.026 2.686-2.26 4.196-.157 1.016-.157 1.804-.157 1.804L20.417 30v-7.268z"/><circle fill="#FFCC4D" cx="8.25" cy="7" r="5"/><circle fill="#FFAC33" cx="8.25" cy="7" r="4"/><path fill="#FFE8B6" d="M18 25.18C3.438 25.18 0 29.844 0 32s1.791 4 4 4h28c2.209 0 4-1.851 4-4s-3.438-6.82-18-6.82z"/><path fill="#F4900C" d="M10.063 22.403c-.516 1.407.555 2.343.555 2.343s.058-.696.113-1.603c.056-.931.879-1.563.908-1.896.095-1.112-.854-1.931-.805-1.541.104.814-.357 1.568-.771 2.697zm-3.681 2.568c-.375.737-.321 2.496-.321 2.496s.9-.529.94-1.074c.04-.545.014-.834.138-1.15.352-.9 1.124-.842 1.595-2.088.167-.44-.194-1.203-.3-.954-.41.959-1.676 2.033-2.052 2.77zm6.045-.337c-.116-.322.124-2.378.328-2.1.204.278-.006 1.161.664 1.886.837.905.721 1.981.491 1.498-.231-.484-1.367-.962-1.483-1.284z"/><path fill="#FFAC33" d="M20.417 27.895v-2.592c-2.263-.383-11.524-1.598-17.676 2.936-.173.128-.184.403-.184.491 0 1.112 3.763-.342 8.31.178 2.185.25 4.613.427 5.258-.052.218-.162-.328-.727-1.352-1.236.513-.132 1.045-.25 1.654-.243 1.983.018 3.3.312 3.99.518z"/><path fill="#77B255" d="M16.535 12.174c1.398 0 2.5 1.135 2.5 2.535v5.782c0 .688 1 1.241 1 1.551V11.441c0-2.1 1.9-3.802 4-3.802s4 1.702 4 3.802v13.171c1-.301 1-.869 1-1.587v-3.247c0-1.4 1.101-2.535 2.5-2.535s2.5 1.135 2.5 2.535v4.435c0 1.399-.94 2.455-1.971 3.049-.787.455-3.029 1.014-4.029 1.047v3.024c0 2-8 2-8 0v-5.567c-1-.075-3.185-.604-3.937-1.038-1.03-.594-2.064-1.649-2.064-3.05v-6.97c.001-1.399 1.1-2.534 2.501-2.534z"/><g fill="#3E721D"><circle cx="32.5" cy="26.748" r=".634"/><circle cx="29.966" cy="22.312" r=".634"/><circle cx="34.401" cy="21.045" r=".634"/><circle cx="17.293" cy="24.847" r=".634"/><circle cx="15.392" cy="19.778" r=".634"/><circle cx="17.927" cy="16.61" r=".634"/><circle cx="14.125" cy="14.709" r=".634"/><circle cx="21.728" cy="29.649" r=".634"/><circle cx="27.43" cy="26.114" r=".634"/><circle cx="22.996" cy="22.312" r=".634"/><circle cx="26.798" cy="19.778" r=".634"/><circle cx="22.362" cy="15.343" r=".634"/><circle cx="28.064" cy="13.442" r=".634"/><circle cx="21.094" cy="9.541" r=".634"/></g><path fill="#F4900C" d="M14.761 27.616s-1.128-.357-1.784-.451 2.588-.271 4.106.224c-1.518-.024-2.322.227-2.322.227z"/></svg> \ No newline at end of file |