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/263a.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/263a.svg')
-rw-r--r-- | public/emoji/263a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/263a.svg b/public/emoji/263a.svg index 2b358e7dc..50201340d 100644 --- a/public/emoji/263a.svg +++ b/public/emoji/263a.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(36,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(34,14)" id="g24"><path id="path26" style="fill:#ff7892;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -2.238,-5 -5,-5 -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5"/></g><g transform="translate(12,14)" id="g28"><path id="path30" style="fill:#ff7892;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.762 -2.238,-5 -5,-5 -2.762,0 -5,2.238 -5,5 0,2.762 2.238,5 5,5 2.762,0 5,-2.238 5,-5"/></g><g transform="translate(21,25)" id="g32"><path id="path34" style="fill:none;stroke:#664500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 0,0 5,1 8,-2"/></g><g transform="translate(15,25)" id="g36"><path id="path38" style="fill:none;stroke:#664500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 0,0 -5,1 -8,-2"/></g><g transform="translate(20,19)" id="g40"><path id="path42" style="fill:none;stroke:#664500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 0,0 4,1 6,-1"/></g><g transform="translate(16,19)" id="g44"><path id="path46" style="fill:none;stroke:#664500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 0,0 -4,1 -6,-1"/></g><g transform="translate(13,11)" id="g48"><path id="path50" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1,-4 5,-4 4,0 5,4 5,4 C 10,0 9,-1 5,-1 1,-1 0,0 0,0"/></g><g transform="translate(13,11)" id="g52"><path id="path54" style="fill:none;stroke:#664500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0,0 1,-4 5,-4 4,0 5,4 5,4 C 10,0 9,-1 5,-1 1,-1 0,0 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18-9.94 0-18-8.059-18-18C0 8.06 8.06 0 18 0c9.941 0 18 8.06 18 18"/><circle fill="#FF7892" cx="29" cy="22" r="5"/><circle fill="#FF7892" cx="7" cy="22" r="5"/><path fill="#664500" d="M29 14c-.256 0-.512-.098-.707-.293-2.577-2.575-7.055-1.736-7.099-1.726-.548.109-1.067-.247-1.174-.787-.107-.541.242-1.066.783-1.174.227-.046 5.563-1.065 8.903 2.273.391.391.391 1.023 0 1.414-.194.195-.45.293-.706.293zM7 14c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414 3.34-3.341 8.678-2.318 8.903-2.273.542.108.893.635.784 1.177-.108.54-.633.892-1.175.785-.069-.015-4.529-.843-7.098 1.726-.195.194-.451.292-.707.292zm19 5c-.256 0-.512-.098-.707-.293-1.304-1.305-4.09-.974-5.052-.736-.54.132-1.077-.195-1.211-.73-.133-.536.192-1.077.728-1.211.186-.046 4.575-1.111 6.949 1.263.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293zm-16 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414 2.373-2.373 6.764-1.309 6.95-1.263.535.134.86.675.727 1.211-.132.536-.673.863-1.21.73-.964-.237-3.749-.567-5.052.736-.196.195-.452.293-.708.293z"/><g fill="#664500"><path d="M13 25s1 4 5 4 5-4 5-4-1 1-5 1-5-1-5-1z"/><path d="M18 29.5c-4.34 0-5.474-4.335-5.485-4.379-.055-.218.043-.445.238-.557.191-.106.43-.079.591.072.039.034 1.066.864 4.656.864 3.644 0 4.647-.855 4.657-.863.165-.146.409-.171.597-.06.188.113.284.331.231.544-.011.044-1.145 4.379-5.485 4.379zm-4.051-3.492C14.526 27.072 15.724 28.5 18 28.5s3.475-1.428 4.051-2.492c-.82.258-2.101.492-4.051.492s-3.231-.234-4.051-.492zM13 25h.01H13z"/></g></svg> \ No newline at end of file |