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/1f42a.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/1f42a.svg')
| -rw-r--r-- | public/emoji/1f42a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f42a.svg b/public/emoji/1f42a.svg index e7f97340d..278e144ff 100644 --- a/public/emoji/1f42a.svg +++ b/public/emoji/1f42a.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(31.5947,20.9932)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.75,3.624 -5.934,9.053 -9.531,9.053 -4.071,0 -8.228,-7.259 -10.071,-10.378 -0.176,-0.299 -0.321,-0.578 -0.464,-0.857 -3.37,1.183 -0.536,6.632 -0.536,10.463 0,0.958 -0.138,1.637 -0.44,2.119 0.488,0.606 0.586,1.347 0.191,1.699 -0.412,0.367 -1.193,0.163 -1.744,-0.456 -0.079,-0.089 -0.129,-0.186 -0.189,-0.28 -0.424,0.067 -0.902,0.102 -1.471,0.102 -0.566,0 -2.916,-0.266 -4.229,-0.792 -3.118,-1.248 -2.118,-4.666 -1.118,-4.666 l 4,0 c 1,0 0.756,-2.31 0,-4.726 -0.83,-2.654 -1.439,-5.145 -1,-6.606 0.808,-2.687 3.712,-3.589 6.164,-3.861 1.059,-2.659 1.517,-6.455 1.473,-7.961 -0.059,-2 1.94,-2.059 1.999,-0.059 0.035,1.211 -0.103,3.68 0.143,5.781 0.658,-2.833 0.935,-6.097 0.899,-7.314 -0.059,-1.998 1.94,-2.057 1.999,-0.059 0.047,1.602 -0.182,6.36 0.559,8.983 0.507,-0.018 1.044,-0.031 1.619,-0.036 1.774,-0.089 3.726,-0.085 5.506,0.015 1.05,-1.592 1.996,-2.991 1.982,-3.435 -0.029,-1 -1.117,-3.968 -1.146,-4.968 -0.029,-1 0.94,-2.03 1.999,-0.059 0.648,1.205 1.324,3.419 1.536,5.421 0.171,-0.364 0.274,-0.656 0.268,-0.843 -0.029,-1 -0.969,-3.929 -0.999,-4.929 -0.029,-0.998 0.941,-2.028 1.999,-0.059 1.059,1.971 1.998,4.898 1.058,6.928 -0.797,1.719 0.431,4.165 0.824,7.914 1.082,-1.665 1.118,-3.351 1.118,-3.459 0,-0.553 0.448,-1 1,-1 0.553,0 1,0.447 1,1 C 4.398,-7.112 4.332,-2.478 0,0"/></g><g transform="translate(8.2798,30.4292)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.016,-0.552 -0.477,-0.986 -1.029,-0.97 -0.552,0.016 -0.986,0.477 -0.97,1.029 0.016,0.552 0.477,0.986 1.029,0.97 C -0.418,1.013 0.017,0.552 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M31.595 15.007c-1.75-3.623-5.934-9.053-9.531-9.053-4.071 0-8.228 7.259-10.071 10.378-.176.299-.321.578-.464.857-3.371-1.182-.536-6.631-.536-10.463 0-.957-.138-1.637-.44-2.119.489-.606.586-1.347.192-1.699-.413-.367-1.195-.163-1.745.456-.08.089-.129.186-.189.28-.424-.067-.903-.102-1.472-.102-.565 0-2.916.266-4.229.791C-.007 5.582.993 9 1.993 9h4c1 0 .756 2.31 0 4.726-.83 2.654-1.439 5.145-1 6.606.808 2.687 3.712 3.589 6.164 3.86 1.059 2.659 1.517 6.455 1.473 7.962-.059 2 1.94 2.059 1.999.059.036-1.211-.102-3.68.143-5.781.658 2.833.935 6.097.899 7.314-.059 1.998 1.94 2.057 1.999.059.047-1.602-.182-6.36.559-8.982.507.017 1.044.03 1.619.035 1.774.09 3.726.085 5.506-.015 1.05 1.592 1.996 2.991 1.982 3.435-.029 1-1.117 3.969-1.146 4.969-.029 1 .94 2.029 1.999.059.648-1.205 1.324-3.419 1.536-5.421.171.364.274.656.269.843-.029 1-.97 3.93-.999 4.93-.029.998.941 2.027 1.999.059 1.059-1.971 1.998-4.898 1.058-6.928-.797-1.72.431-4.165.824-7.914 1.082 1.665 1.117 3.351 1.118 3.459 0 .553.447 1 1 1 .553 0 1-.447 1-1-.001-.215-.067-4.85-4.399-7.327z"/><path fill="#292F33" d="M8.28 5.571c-.016.552-.477.986-1.029.97-.552-.016-.986-.477-.97-1.029.016-.552.477-.986 1.029-.97.552.016.986.477.97 1.029z"/></svg> \ No newline at end of file |
