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/1f474-1f3fe.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/1f474-1f3fe.svg')
-rw-r--r-- | public/emoji/1f474-1f3fe.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f474-1f3fe.svg b/public/emoji/1f474-1f3fe.svg index 1f19763a2..2fb9707f3 100644 --- a/public/emoji/1f474-1f3fe.svg +++ b/public/emoji/1f474-1f3fe.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(32.7334,25.3667)" id="g20"><path id="path22" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.068 -6.597,-7.367 -14.733,-7.367 -8.138,0 -14.734,3.299 -14.734,7.367 0,4.069 1.134,8.634 14.734,8.634 C -1.134,8.634 0,4.069 0,0"/></g><g transform="translate(32.167,22.5337)" id="g24"><path id="path26" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.318,0 -0.619,-0.103 -0.904,-0.258 -1.36,7.616 -6.777,12.725 -13.263,12.725 -6.487,0 -11.903,-5.109 -13.263,-12.724 -0.285,0.154 -0.586,0.257 -0.904,0.257 -1.564,0 -2.833,-2.03 -2.833,-4.534 0,-2.504 1.269,-4.533 2.833,-4.533 0.381,0 0.744,0.124 1.075,0.342 1.595,-7.383 6.845,-12.809 13.092,-12.809 6.247,0 11.497,5.426 13.091,12.81 0.332,-0.219 0.695,-0.343 1.076,-0.343 1.564,0 2.833,2.029 2.833,4.533 C 2.833,-2.03 1.564,0 0,0"/></g><g transform="translate(11.2012,17)" id="g28"><path id="path30" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.367,0 -0.72,0.203 -0.896,0.553 -0.247,0.494 -0.046,1.095 0.448,1.342 L 1.818,3.027 C 2.313,3.274 2.913,3.073 3.16,2.58 3.407,2.086 3.206,1.485 2.713,1.238 L 0.446,0.105 C 0.303,0.034 0.15,0 0,0"/></g><g transform="translate(24.7988,17)" id="g32"><path id="path34" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.15,0 -0.303,0.034 -0.446,0.105 l -2.267,1.133 c -0.494,0.247 -0.694,0.848 -0.447,1.342 0.246,0.493 0.849,0.695 1.342,0.447 L 0.448,1.895 C 0.942,1.648 1.143,1.047 0.896,0.553 0.721,0.203 0.367,0 0,0"/></g><g transform="translate(26,22)" id="g36"><path id="path38" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 L 0,2 C 0.553,2 1,1.552 1,1 1,0.448 0.553,0 0,0"/></g><g transform="translate(13,22)" id="g40"><path id="path42" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L 0,2 C 0.552,2 1,1.552 1,1 1,0.448 0.552,0 0,0"/></g><g transform="translate(18,5.667)" id="g44"><path id="path46" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.474,0 -4.879,1.187 -4.98,1.238 -0.494,0.247 -0.694,0.846 -0.448,1.34 0.246,0.495 0.848,0.692 1.341,0.45 C -4.066,3.018 -1.994,2 0,2 2.008,2 4.065,3.017 4.086,3.027 4.579,3.271 5.182,3.074 5.428,2.58 5.675,2.086 5.475,1.485 4.98,1.238 4.879,1.187 2.475,0 0,0"/></g><g transform="translate(19,11)" id="g48"><path id="path50" style="fill:#915a34;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L 0,2 C 0.553,2 1,1.553 1,1 1,0.447 0.553,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D1D3D4" d="M32.733 10.633C32.733 14.702 26.137 18 18 18S3.267 14.702 3.267 10.633 4.4 2 18 2c13.6 0 14.733 4.564 14.733 8.633z"/><path fill="#AF7E57" d="M32.167 13.466c-.318 0-.619.103-.904.258C29.903 6.108 24.486 1 18 1 11.513 1 6.097 6.108 4.737 13.724c-.285-.154-.586-.257-.904-.257C2.269 13.466 1 15.497 1 18c0 2.504 1.269 4.533 2.833 4.533.381 0 .743-.124 1.075-.342C6.503 29.574 11.753 35 18 35s11.497-5.426 13.091-12.81c.332.219.695.343 1.076.343C33.731 22.533 35 20.504 35 18c0-2.503-1.269-4.534-2.833-4.534z"/><path fill="#60352A" d="M11.201 19c-.367 0-.72-.203-.895-.553-.247-.494-.046-1.095.447-1.342l2.267-1.133c.495-.247 1.095-.045 1.342.447.247.494.046 1.095-.447 1.342l-2.267 1.133c-.144.072-.297.106-.447.106zm13.598 0c-.15 0-.303-.034-.446-.105l-2.267-1.133c-.494-.247-.694-.848-.447-1.342.246-.493.849-.695 1.342-.447l2.267 1.133c.494.247.694.848.447 1.342-.175.349-.529.552-.896.552z"/><path d="M26 14h-3c-.553 0-1-.448-1-1s.447-1 1-1h3c.553 0 1 .448 1 1s-.447 1-1 1zm-13 0h-3c-.552 0-1-.448-1-1s.448-1 1-1h3c.552 0 1 .448 1 1s-.448 1-1 1z" fill="#D1D3D4"/><path fill="#915A34" d="M18 30.333c-2.474 0-4.879-1.188-4.981-1.238-.493-.247-.693-.846-.447-1.34.246-.495.848-.692 1.34-.45.021.011 2.094 1.028 4.087 1.028 2.008 0 4.065-1.017 4.086-1.027.493-.244 1.096-.047 1.342.447.247.494.047 1.095-.447 1.342-.101.051-2.505 1.238-4.98 1.238zM19 25h-2c-.552 0-1-.447-1-1s.448-1 1-1h2c.553 0 1 .447 1 1s-.447 1-1 1z"/></svg> \ No newline at end of file |