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/1f948.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/1f948.svg')
| -rw-r--r-- | public/emoji/1f948.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f948.svg b/public/emoji/1f948.svg index 75283797e..da0690fd9 100644 --- a/public/emoji/1f948.svg +++ b/public/emoji/1f948.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 8,36 C 5.042,36 2,31 3,29 l 0,0 C 4.613,25.775 15,16 15,16 l 0,0 6,0 c 0,0 10,10 12,13 l 0,0 c 1,2 -2.333,7 -5,7 l 0,0 -20,0 z m 4,-8 c -2,2 -1,2 6,2 l 0,0 c 8,0 7.5,-0.5 6,-2 l 0,0 -6,-6 -6,6 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" 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(24,28)" id="g20"><path id="path22" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6,-6 -6,6 c -2,2 -1,2 6,2 8,0 7.5,-0.5 6,-2 m 4,8 -20,0 c -2.958,0 -6,-5 -5,-7 1.612,-3.225 12,-13 12,-13 l 6,0 C -3,-12 7,-2 9,1 10,3 6.667,8 4,8"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(13,27)" id="g32"><path id="path34" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1,1 -8,9 -3,9 L 13,9 C 15.268,9 17,7 11,1 8,-2 0,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(22,15.5)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.672,-1.5 -1.5,-1.5 l -5,0 c -0.829,0 -1.5,0.672 -1.5,1.5 0,0.828 0.671,1.5 1.5,1.5 l 5,0 C -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(26,8)" id="g48"><path id="path50" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.418 -3.582,-8 -8,-8 -4.419,0 -8,3.582 -8,8 0,4.418 3.581,8 8,8 4.418,0 8,-3.582 8,-8"/></g><g transform="translate(14.9352,4.0615)" id="g52"><path id="path54" style="fill:#627077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.813,1.065 2.889,3.885 3.716,5.146 0.182,0.281 0.365,0.673 0.365,1.066 0,0.533 -0.45,1.01 -1.235,1.01 -0.575,0 -1.094,-0.407 -1.36,-0.701 -0.112,-0.113 -0.28,-0.113 -0.392,0 L 0.238,7.39 C 0.14,7.475 0.126,7.643 0.224,7.755 c 0,0 1.136,1.374 2.805,1.374 2.005,0 3.183,-1.276 3.183,-2.833 0,-0.743 -0.21,-1.163 -0.547,-1.822 -0.448,-0.8 -1.599,-2.3 -2.257,-3.226 l 2.657,0 c 0.139,0 0.266,-0.126 0.266,-0.267 l 0,-1.261 c 0,-0.141 -0.127,-0.267 -0.266,-0.267 l -5.799,0 C 0.112,-0.547 0,-0.421 0,-0.28 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M28 0H8C5.042 0 2 5 3 7c1.612 3.225 12 13 12 13h6S31 10 33 7c1-2-2.333-7-5-7zm-4 8l-6 6-6-6c-.532-.532-.843-.919-.894-1.206C10.965 6.003 12.862 6 18 6c6.916 0 7.476.375 6.532 1.446-.147.168-.329.351-.532.554z"/><path fill="#3B88C3" d="M11.106 6.794C10.965 6.003 12.862 6 18 6c6.916 0 7.476.375 6.532 1.446C29.866 1.885 28.195 0 26 0H10c-3.579 0-1.01 4.097 1.106 6.794z"/><path fill="#CCD6DD" d="M21.902 21.02c.06-.163.098-.337.098-.52 0-.828-.672-1.5-1.5-1.5h-5c-.829 0-1.5.672-1.5 1.5 0 .183.038.357.098.52C11.654 22.389 10 25 10 28c0 4.418 3.581 8 8 8 4.418 0 8-3.582 8-8 0-3-1.654-5.611-4.098-6.98z"/><path fill="#627077" d="M21 30.69h-2.657c.659-.926 1.809-2.426 2.257-3.226.337-.659.547-1.079.547-1.822 0-1.557-1.178-2.833-3.183-2.833-1.669 0-2.805 1.374-2.805 1.374-.098.112-.084.28.014.365l.855.869c.112.112.28.112.393 0 .266-.295.785-.701 1.36-.701.785 0 1.235.477 1.235 1.01 0 .393-.183.785-.365 1.065-.828 1.262-2.903 4.081-3.716 5.146v.28c0 .141.112.267.266.267H21c.14 0 .267-.126.267-.267v-1.262c0-.139-.127-.265-.267-.265z"/></svg> \ No newline at end of file |
