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/1f969.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/1f969.svg')
-rw-r--r-- | public/emoji/1f969.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f969.svg b/public/emoji/1f969.svg index 3b9d7741d..28a6a1ac6 100644 --- a/public/emoji/1f969.svg +++ b/public/emoji/1f969.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(18,25)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9,0 -17,-3.461 -17,-9 0,-4.154 4,-7.615 10,-7.615 3.454,0 7.111,2.085 9.727,2.085 0.092,0 0.183,-0.003 0.273,-0.008 3.909,-0.235 4,-3.462 9,-3.462 2.341,0 5,2.077 5,6.923 C 17,-4.846 10,0 0,0"/></g><path id="path24" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 33,18 2,0 0,-4 -2,0 0,4 z"/><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 1,20 2,0 0,-4 -2,0 0,4 z"/><g transform="translate(30,11.6924)" id="g28"><path id="path30" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.27,0 -3.282,0.755 -4.455,1.628 -1.069,0.797 -2.281,1.699 -4.458,1.831 -0.119,0.007 -0.238,0.011 -0.36,0.011 -1.433,0 -2.978,-0.484 -4.614,-0.996 -1.712,-0.535 -3.481,-1.089 -5.113,-1.089 -5.215,0 -9,2.912 -9,6.923 0,5.396 8.244,8.307 16,8.307 9.271,0 16,-4.367 16,-10.385 C 4,1.659 1.607,0 0,0"/></g><g transform="translate(18,29)" id="g32"><path id="path34" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9,0 -17,-3.461 -17,-9 0,-4.154 4,-7.615 10,-7.615 3.454,0 7.111,2.085 9.727,2.085 0.092,0 0.183,-0.003 0.273,-0.008 3.909,-0.235 4,-3.462 9,-3.462 2.341,0 5,2.077 5,6.923 C 17,-4.846 10,0 0,0 m 0,-1.385 c 8.691,0 15,-4.076 15,-9.692 0,-4.144 -2.061,-5.538 -3,-5.538 -1.834,0 -2.585,0.559 -3.723,1.407 -1.132,0.844 -2.543,1.894 -5.104,2.049 -0.147,0.009 -0.295,0.014 -0.446,0.014 -1.648,0 -3.289,-0.514 -5.026,-1.057 -1.615,-0.506 -3.285,-1.028 -4.701,-1.028 -3.976,0 -8,2.14 -8,6.23 0,4.946 7.729,7.615 15,7.615"/></g><g transform="translate(16.1606,27.5571)" id="g36"><path id="path38" style="fill:#ffe8b6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 2.839,0.058 4.839,-1.326 1,-0.693 0.335,-2.25 0.335,-2.25 l 1.665,-0.52 c 0,0 -0.061,0.836 3,1.385 2.251,0.404 4.542,-1.385 4.542,-1.385 0,0 -2.542,3.462 -7.542,4.154 C 1.839,0.75 0,0 0,0"/></g><g transform="translate(25,22.0771)" id="g40"><path id="path42" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.529 -1.791,-2.77 -4,-2.77 -2.209,0 -4,1.241 -4,2.77 0,1.529 1.791,2.769 4,2.769 2.209,0 4,-1.24 4,-2.769"/></g><g transform="translate(23,22.0771)" id="g44"><path id="path46" style="fill:#a7a9ac;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.765 -0.895,-1.385 -2,-1.385 -1.104,0 -2,0.62 -2,1.385 0,0.765 0.896,1.384 2,1.384 1.105,0 2,-0.619 2,-1.384"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M18 11c-9 0-17 3.461-17 9 0 4.154 4 7.615 10 7.615 3.454 0 7.111-2.085 9.727-2.085.093 0 .184.003.273.008 3.909.235 4 3.462 9 3.462 2.341 0 5-2.077 5-6.923C35 15.846 28 11 18 11z"/><path fill="#FFD983" d="M33 18h2v4h-2zM1 16h2v4H1z"/><path fill="#A0041E" d="M30 24.308c-2.271 0-3.282-.755-4.455-1.628-1.069-.797-2.281-1.699-4.458-1.831-.119-.007-.238-.011-.36-.011-1.433 0-2.978.483-4.613.996-1.712.535-3.482 1.089-5.113 1.089-5.215 0-9-2.912-9-6.923 0-5.396 8.244-8.308 16-8.308 9.271 0 16 4.367 16 10.385C34 22.648 31.607 24.308 30 24.308z"/><path fill="#FFE8B6" d="M18 8.385c8.691 0 15 4.076 15 9.692 0 4.144-2.06 5.538-3 5.538-1.834 0-2.585-.559-3.723-1.407-1.133-.844-2.543-1.895-5.104-2.049-.146-.009-.295-.014-.446-.014-1.648 0-3.289.514-5.025 1.057-1.616.506-3.286 1.028-4.702 1.028-3.976 0-8-2.141-8-6.23 0-4.946 7.729-7.615 15-7.615M18 7C9 7 1 10.461 1 16c0 4.154 4 7.615 10 7.615 3.454 0 7.111-2.085 9.727-2.085.093 0 .184.003.273.008 3.909.235 4 3.462 9 3.462 2.341 0 5-2.077 5-6.923C35 11.846 28 7 18 7z"/><path fill="#FFE8B6" d="M16.161 8.443S19 8.385 21 9.769c1 .692.335 2.25.335 2.25l1.665.52s-.062-.835 3-1.385c2.251-.404 4.542 1.385 4.542 1.385S28 9.077 23 8.385c-5-.693-6.839.058-6.839.058z"/><path fill="#E6E7E8" d="M25 13.923c0 1.529-1.791 2.769-4 2.769s-4-1.24-4-2.769c0-1.529 1.791-2.769 4-2.769s4 1.24 4 2.769z"/><path fill="#A7A9AC" d="M23 13.923c0 .765-.896 1.385-2 1.385s-2-.62-2-1.385.896-1.384 2-1.384 2 .619 2 1.384z"/></svg> \ No newline at end of file |