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/26cf.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/26cf.svg')
| -rw-r--r-- | public/emoji/26cf.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26cf.svg b/public/emoji/26cf.svg index 5e434df61..ac8ac017f 100644 --- a/public/emoji/26cf.svg +++ b/public/emoji/26cf.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.1855,2.7207)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.166,-1.166 3.021,-1.221 4.121,-0.121 5.221,0.979 5.166,2.834 4,4 l -23.265,23.266 c -1.167,1.166 -3.021,1.221 -4.121,0.121 -1.1,-1.1 -1.046,-2.955 0.121,-4.121 L 0,0 Z"/></g><g transform="translate(3.415,28.3428)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.781,0.781 -0.781,2.048 0,2.829 l 1.414,1.414 c 0.78,0.78 2.047,0.78 2.828,0 0.781,-0.781 0.781,-2.048 0,-2.829 L 2.828,0 C 2.047,-0.78 0.78,-0.78 0,0"/></g><g transform="translate(23,35)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.857,0.743 -11.001,3 -18,-4 l 0,0 c -7,-7 -4.743,-16.143 -4,-18 2,-5 1.671,1.064 2,3 1.015,5.971 3.822,9.178 5.822,11.178 2,2 5.229,4.793 11.178,5.822 1.921,0.332 8,0 3,2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><g fill="#F4900C"><path d="M29.185 33.279c1.166 1.166 3.022 1.221 4.121.121 1.1-1.1 1.045-2.955-.121-4.121L9.921 6.014C8.754 4.847 6.899 4.792 5.8 5.893c-1.101 1.1-1.046 2.955.121 4.121l23.264 23.265z"/><path d="M3.415 7.657c-.781-.781-.781-2.048 0-2.829l1.414-1.414c.78-.78 2.047-.78 2.828 0 .781.781.781 2.048 0 2.829L6.243 7.657c-.781.781-2.048.781-2.828 0z"/></g><path fill="#66757F" d="M23 1C21.143.257 12-2 5 5S.257 21.143 1 23c2 5 1.671-1.063 2-3 1.015-5.971 3.822-9.178 5.822-11.178S14.051 4.029 20 3c1.921-.332 8 0 3-2z"/></svg> \ No newline at end of file |
