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/1f58d.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/1f58d.svg')
| -rw-r--r-- | public/emoji/1f58d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f58d.svg b/public/emoji/1f58d.svg index 69bc06e75..5a4cbe8e1 100644 --- a/public/emoji/1f58d.svg +++ b/public/emoji/1f58d.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(35.702,28.5234)" id="g20"><path id="path22" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.18,7.179 c -0.396,0.397 -1.038,0.397 -1.436,0 l -23.691,-23.692 c -0.397,-0.397 -0.397,-1.038 0,-1.437 0.72,-0.719 -3.14,-7.958 -3.395,-8.495 l 2.068,-2.078 c 0.536,0.255 7.786,4.115 8.506,3.395 0.397,-0.398 1.039,-0.398 1.436,0 L 0,-1.436 C 0.397,-1.04 0.397,-0.397 0,0"/></g><g transform="translate(12.7588,4.1396)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.62,8.62 22.268,22.268 8.62,-8.62 L 0,0 Z"/></g><g transform="translate(32.1543,23.5342)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.62,8.62 -7.184,10.057 1.437,1.437 0,0 Z"/></g><g transform="translate(14.1958,5.5762)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.62,8.62 -7.183,10.057 1.436,1.436 0,0 Z"/></g><g transform="translate(26.8857,26.647)" id="g36"><path id="path38" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.52,1.521 -5.982,-0.476 -9.967,-4.459 -3.983,-3.984 -5.979,-8.447 -4.459,-9.967 1.52,-1.521 5.983,0.475 9.967,4.459 C -0.475,-5.983 1.521,-1.52 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M35.702 7.477L28.522.298c-.396-.397-1.038-.397-1.436 0L3.395 23.989c-.397.397-.397 1.038 0 1.437.72.719-3.14 7.959-3.395 8.496L2.068 36c.536-.255 7.785-4.115 8.506-3.395.397.397 1.039.397 1.436 0L35.702 8.913c.397-.396.397-1.039 0-1.436z"/><path fill="#EA596E" d="M4.139 23.24L26.407.972l8.62 8.62L12.759 31.86z"/><path fill="#292F33" d="M23.534 3.846l1.437-1.436 8.62 8.62-1.437 1.436zM5.576 21.803l1.436-1.437 8.62 8.62-1.437 1.437z"/><path fill="#BE1931" d="M26.886 9.353c-1.521-1.521-5.982.476-9.967 4.459-3.983 3.984-5.979 8.446-4.459 9.967 1.52 1.521 5.983-.476 9.967-4.459 3.983-3.984 5.979-8.447 4.459-9.967z"/></svg> \ No newline at end of file |
