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/1f9da-1f3fc-200d-2642-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/1f9da-1f3fc-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f9da-1f3fc-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9da-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9da-1f3fc-200d-2642-fe0f.svg index f832ccb7a..89375bdec 100644 --- a/public/emoji/1f9da-1f3fc-200d-2642-fe0f.svg +++ b/public/emoji/1f9da-1f3fc-200d-2642-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></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(20.7689,15.7271)" id="g20"><path id="path22" style="fill:#abdfff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.558,-6.089 -5.676,-12.675 -2.497,-14.71 3.178,-2.035 9.45,1.252 14.008,7.341 C 16.069,-1.28 14.263,9.66 14.008,9.262 12.231,6.488 4.558,6.089 0,0"/></g><g transform="translate(15.2555,15.7271)" id="g24"><path id="path26" style="fill:#abdfff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.558,-6.089 5.676,-12.675 2.498,-14.71 -3.179,-2.035 -9.451,1.252 -14.009,7.341 C -16.069,-1.28 -14.351,9.6 -14.008,9.262 -10.255,5.563 -4.558,6.089 0,0"/></g><g transform="translate(31,0)" id="g28"><path id="path30" style="fill:#f3d2a2;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(31.4018,18.1712)" id="g32"><path id="path34" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.96,-1.604 -1.586,-3.147 -4.251,-5.659 -1.029,-0.971 -0.94,-2.246 0.18,-1.398 2.663,2.015 4.305,5.221 4.847,7.268 C 1.158,1.652 0.484,0.808 0,0 m -26.804,0 c 0.96,-1.604 1.586,-3.147 4.251,-5.659 1.03,-0.971 0.941,-2.246 -0.179,-1.398 -2.664,2.015 -4.306,5.221 -4.848,7.268 -0.382,1.441 0.293,0.597 0.776,-0.211"/></g><g transform="translate(18.8529,34)" id="g36"><path id="path38" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.024,0 -3.893,-0.647 -5.426,-1.737 -3.15,-0.164 -5.662,-2.748 -5.662,-5.939 0,-2.631 0.011,-5.944 3.476,-7.178 1.703,-2.365 4.474,-3.911 7.612,-3.911 5.181,0 9.382,4.2 9.382,9.381 C 9.382,-4.201 5.181,0 0,0"/></g><g transform="translate(13.9832,15.9916)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-8.034 c 0,-2.218 1.799,-4.016 4.017,-4.016 2.218,0 4.017,1.798 4.017,4.016 L 8.034,0 0,0 Z"/></g><g transform="translate(22.0168,18)" id="g44"><path id="path46" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.034,-0.037 0,-7.997 c 0,0 4.017,-2.008 8.034,0 L 0,0 Z"/></g><g transform="translate(26.5294,28)" id="g48"><path id="path50" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -17.059,0 0,-9.353 0,-10e-4 c 0,-4.712 3.818,-8.528 8.53,-8.528 4.711,0 8.529,3.816 8.529,8.528 L 0,-9.353 0,0 Z"/></g><g transform="translate(8.625,28.8824)" id="g52"><path id="path54" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.846,-6.824 c 3.979,0 4.861,4.115 5.057,5.95 0.067,-1.835 1.39,-5.95 12.001,-5.95 L 18.25,0 0,0 Z"/></g><g transform="translate(21.4118,13.5294)" id="g56"><path id="path58" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.412,0 -3.412,0 c 0,0 0,-1.706 3.412,-1.706 C 0,-1.706 0,0 0,0"/></g><g transform="translate(16.2941,16.9412)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.706,0 1.706,0 c 0,0 0,-1.706 -1.706,-1.706 C 0,-1.706 0,0 0,0"/></g><g transform="translate(18,3)" id="g64"><path id="path66" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 -9,0 0,3 -2,5 c 0,0 1,1 4,1 l 3,0 4,-6 z"/></g><g transform="translate(18,3)" id="g68"><path id="path70" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-3 9,0 0,3 2,5 C 11,5 10,6 7,6 L 4,6 0,0 Z"/></g><g transform="translate(22,18)" id="g72"><path id="path74" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,1 C -1,2.55 -0.55,3 0,3 0.55,3 1,2.55 1,2 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(15,19)" id="g76"><path id="path78" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,1 C 0,1.55 -0.45,2 -1,2 -1.55,2 -2,1.55 -2,1 l 0,-1 c 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#ABDFFF" d="M20.769 20.273c-4.558 6.089-5.676 12.675-2.497 14.71 3.179 2.035 9.451-1.252 14.008-7.341 4.558-6.089 2.752-17.029 2.497-16.631-1.777 2.774-9.45 3.173-14.008 9.262z"/><path fill="#ABDFFF" d="M15.255 20.273c4.558 6.089 5.676 12.675 2.498 14.71-3.179 2.035-9.451-1.252-14.009-7.341S.904 10.673 1.247 11.011C5 14.71 10.698 14.184 15.255 20.273z"/><path fill="#55ACEE" d="M31.402 17.829c-.96 1.604-1.586 3.147-4.251 5.659-1.03.971-.941 2.245.179 1.398 2.664-2.015 4.306-5.221 4.848-7.268.382-1.441-.292-.597-.776.211zm-26.804 0c-.484-.808-1.158-1.652-.776-.211.542 2.047 2.184 5.253 4.848 7.268 1.12.847 1.209-.427.179-1.398-2.665-2.512-3.291-4.055-4.251-5.659z"/><path fill="#F3D2A2" 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="#FFE51E" d="M18.853 2c-2.024 0-3.893.647-5.426 1.737-3.15.164-5.662 2.749-5.662 5.94 0 2.63.012 5.943 3.477 7.177 1.703 2.365 4.474 3.911 7.611 3.911 5.181 0 9.382-4.2 9.382-9.381C28.235 6.201 24.034 2 18.853 2z"/><path fill="#F3D2A2" d="M13.983 20.008v8.034c0 2.218 1.799 4.017 4.017 4.017s4.017-1.799 4.017-4.017v-8.034h-8.034z"/><path fill="#E2C196" d="M22.017 18l-8.034.037v7.996s4.017 2.008 8.034 0V18z"/><path fill="#F3D2A2" d="M26.529 8H9.471v9.354c0 4.712 3.818 8.529 8.529 8.529s8.529-3.817 8.529-8.529V8z"/><path fill="#FFE51E" d="M8.625 7.118l.846 6.824c3.98 0 4.861-4.115 5.058-5.95.067 1.835 1.389 5.95 12.001 5.95l.346-6.824H8.625z"/><path fill="#C1694F" d="M21.412 22.471h-6.824s0 1.706 3.412 1.706 3.412-1.706 3.412-1.706zm-5.118-3.412h3.412s0 1.706-1.706 1.706-1.706-1.706-1.706-1.706z"/><path fill="#5C913B" d="M18 33v3H9v-3l-2-5s1-1 4-1h3l4 6zm0 0v3h9v-3l2-5s-1-1-4-1h-3l-4 6z"/><path fill="#662113" d="M22 18c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1zm-7-1v-1c0-.55-.45-1-1-1s-1 .45-1 1v1c0 .55.45 1 1 1s1-.45 1-1z"/></svg> \ No newline at end of file |