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/1f465.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/1f465.svg')
| -rw-r--r-- | public/emoji/1f465.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f465.svg b/public/emoji/1f465.svg index 9ac02e6dc..571a3f344 100644 --- a/public/emoji/1f465.svg +++ b/public/emoji/1f465.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(29,15.2715)" id="g20"><path id="path22" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1.963 c 1,1.03 2.914,2.89 3.391,5.273 0.141,-0.079 0.054,-0.13 0.213,-0.13 0.757,0 1.255,0.984 1.255,2.198 0,1.194 -0.656,2.161 -1.398,2.191 0.143,0.515 0.212,1.206 0.212,2.091 0,2.956 -2.549,6.505 -8.253,6.505 -5.068,0 -8.244,-3.549 -8.244,-6.505 0,-0.858 0.051,-1.562 0.142,-2.107 -0.697,-0.105 -1.247,-1.033 -1.247,-2.175 0,-1.214 0.615,-2.198 1.373,-2.198 0.158,0 -0.069,0.051 0.072,0.13 C -12.007,4.853 -10,2.993 -9,1.963 l 0,-1.847 c -4,-0.492 -7,-2.628 -7,-4.764 l 0,-0.644 0,-0.167 c 0,-0.812 0.823,-0.812 1.634,-0.812 l 8.554,0 1.624,0 8.552,0 c 0.813,0 1.636,0 1.636,0.812 l 0,0.167 0,0.644 c 0,2 -3,3.996 -6,4.648"/></g><g transform="translate(17,7.2715)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,1.963 c 1,1.03 2.914,2.889 3.391,5.273 0.141,-0.079 0.054,-0.13 0.213,-0.13 0.757,0 1.255,0.984 1.255,2.198 0,1.194 -0.656,2.161 -1.398,2.191 0.143,0.515 0.212,1.206 0.212,2.091 0,2.956 -2.549,6.505 -8.253,6.505 -5.069,0 -8.244,-3.549 -8.244,-6.505 0,-0.858 0.051,-1.562 0.142,-2.107 -0.697,-0.105 -1.247,-1.033 -1.247,-2.175 0,-1.214 0.615,-2.198 1.373,-2.198 0.158,0 -0.069,0.051 0.072,0.13 C -12.007,4.852 -10,2.993 -9,1.963 l 0,-1.847 c -4,-0.492 -7,-2.628 -7,-4.764 l 0,-0.644 0,-0.167 c 0,-0.812 0.823,-0.812 1.634,-0.812 l 8.554,0 1.623,0 8.553,0 c 0.813,0 1.636,0 1.636,0.812 l 0,0.167 0,0.644 c 0,2 -3,3.996 -6,4.648"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M29 20.729v-1.963c1-1.03 2.914-2.89 3.391-5.273.142.079.055.13.213.13.758 0 1.256-.983 1.256-2.197 0-1.194-.656-2.161-1.399-2.191.143-.516.212-1.206.212-2.092 0-2.956-2.549-6.505-8.253-6.505-5.068 0-8.244 3.549-8.244 6.505 0 .858.051 1.562.142 2.107-.697.105-1.247 1.033-1.247 2.175 0 1.214.614 2.197 1.373 2.197.157 0-.069-.051.072-.13.477 2.384 2.484 4.243 3.484 5.274v1.847c-4 .492-7 2.628-7 4.765v.81c0 .812.823.812 1.634.812h18.73c.813 0 1.636 0 1.636-.812v-.81c0-2.001-3-3.997-6-4.649z"/><path fill="#292F33" d="M17 28.729v-1.963c1-1.03 2.914-2.89 3.391-5.273.142.079.055.13.213.13.758 0 1.256-.983 1.256-2.197 0-1.194-.656-2.161-1.399-2.191.143-.516.212-1.206.212-2.092 0-2.956-2.549-6.505-8.253-6.505-5.069 0-8.244 3.549-8.244 6.505 0 .858.051 1.562.142 2.107-.697.105-1.247 1.033-1.247 2.175 0 1.214.614 2.197 1.373 2.197.157 0-.069-.051.072-.13C4.993 23.876 7 25.735 8 26.766v1.847c-4 .492-7 2.628-7 4.765v.811C1 35 1.823 35 2.634 35h18.73c.813 0 1.636 0 1.636-.812v-.811c0-2-3-3.996-6-4.648z"/></svg> \ No newline at end of file |
