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/2122.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/2122.svg')
| -rw-r--r-- | public/emoji/2122.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2122.svg b/public/emoji/2122.svg index 554777689..00d477250 100644 --- a/public/emoji/2122.svg +++ b/public/emoji/2122.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(5.2075,23.3262)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.834,0 c -1.248,0 -1.768,0.91 -1.768,1.794 0,0.91 0.65,1.794 1.768,1.794 l 9.568,0 C 7.853,3.588 8.502,2.704 8.502,1.794 8.502,0.91 7.982,0 6.734,0 L 3.9,0 l 0,-13.053 c 0,-1.299 -0.832,-2.027 -1.95,-2.027 -1.118,0 -1.95,0.728 -1.95,2.027 L 0,0 Z"/></g><g transform="translate(16.4658,25.0679)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.156,0.936 1.17,2.002 2.548,2.002 1.301,0 2.314,-0.936 2.601,-1.872 l 3.067,-10.296 0.053,0 3.068,10.296 c 0.285,0.936 1.301,1.872 2.599,1.872 1.379,0 2.393,-1.066 2.549,-2.002 l 2.418,-14.507 c 0.026,-0.157 0.026,-0.313 0.026,-0.444 0,-1.142 -0.832,-1.871 -1.871,-1.871 -1.327,0 -1.848,0.598 -2.03,1.821 l -1.533,10.581 -0.053,0 -3.119,-10.894 c -0.181,-0.623 -0.676,-1.508 -2.08,-1.508 -1.404,0 -1.898,0.885 -2.08,1.508 l -3.121,10.894 -0.051,0 -1.535,-10.581 c -0.182,-1.223 -0.702,-1.821 -2.028,-1.821 -1.04,0 -1.872,0.729 -1.872,1.871 0,0.131 0,0.287 0.026,0.444 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M5.208 12.674H2.374c-1.248 0-1.768-.91-1.768-1.794 0-.91.65-1.794 1.768-1.794h9.568c1.118 0 1.768.884 1.768 1.794 0 .884-.52 1.794-1.768 1.794H9.108v13.053c0 1.299-.832 2.027-1.95 2.027-1.118 0-1.95-.729-1.95-2.027V12.674zm11.258-1.742c.156-.936 1.17-2.002 2.548-2.002 1.301 0 2.314.937 2.601 1.872l3.066 10.296h.053l3.068-10.296c.285-.936 1.301-1.872 2.6-1.872 1.379 0 2.393 1.066 2.549 2.002l2.418 14.507c.025.156.025.312.025.443 0 1.143-.832 1.871-1.871 1.871-1.326 0-1.848-.598-2.029-1.82l-1.533-10.581h-.053l-3.119 10.894c-.182.623-.676 1.508-2.08 1.508s-1.899-.885-2.08-1.508l-3.121-10.894h-.051l-1.535 10.581c-.182 1.223-.702 1.82-2.028 1.82-1.04 0-1.872-.729-1.872-1.871 0-.131 0-.287.026-.443l2.418-14.507z" fill="#292F33"/></svg> \ No newline at end of file |
