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/1f434.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/1f434.svg')
-rw-r--r-- | public/emoji/1f434.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f434.svg b/public/emoji/1f434.svg index ae0185799..9aa7d6935 100644 --- a/public/emoji/1f434.svg +++ b/public/emoji/1f434.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(23.2832,12.7246)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.374,-1.635 2.733,-10.047 0.143,-0.883 0.202,-1.775 0.217,-2.678 l 9.767,0 0,28.553 c -4.387,3.472 -10.4,4.188 -17.678,1.757 0,0 -5.408,3 -6.147,3.74 -0.719,0.719 -1.857,1.555 -1.235,-0.35 0.364,-1.113 0.764,-2.373 2.359,-4.862 -3.436,-2.036 -4.513,-4.68 -8.558,-13.342 -3.089,-6.616 -4.662,-8.764 -3.805,-11.292 1.13,-3.337 5.316,-5.595 8.844,-3.021 1.919,1.4 2.246,3.913 6.225,6.223 C -3.624,-5.255 0,-3.716 0,0"/></g><g transform="translate(36,29.9878)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -8.335,5.711 -21.646,4.539 -20.091,-0.178 -10.49,1.684 -4.23,-1.719 0,-7.346 L 0,0 Z"/></g><g transform="translate(19.6631,30.2373)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.878,-0.233 -7.157,-1.595 -9.296,-3.967 0,0 -0.129,5.147 3.566,5.613 C 0.441,2.425 0.078,1.284 0.078,1.284 L 0,0 Z"/></g><g transform="translate(16.3569,34.9438)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.558,-1.155 4.006,-1.79 5.056,-6.029 6.107,-10.269 1.922,-8.979 0.7,-6.884 -0.662,-4.551 -1.128,-2.723 -1.167,-1.206 -1.188,-0.404 -1.128,2.333 0,0"/></g><g transform="translate(16.5962,33.1616)" id="g36"><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.103,-0.968 2.448,-2.472 2.65,-3.955 2.852,-5.438 1.525,-4.943 0.914,-3.583 0.302,-2.224 0.161,-0.804 -0.22,-0.35 -0.6,0.104 0,0 0,0"/></g><g transform="translate(16.9399,20.4746)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.687 -0.557,-1.244 -1.245,-1.244 -0.687,0 -1.244,0.557 -1.244,1.244 0,0.687 0.557,1.245 1.244,1.245 C -0.557,1.245 0,0.687 0,0"/></g><g transform="translate(4.2217,6.083)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.881 -0.532,-1.594 -1.187,-1.594 -0.654,0 -1.186,0.713 -1.186,1.594 0,0.882 0.532,1.596 1.186,1.596 C -0.532,1.596 0,0.882 0,0"/></g><g transform="translate(10.3545,26.0757)" id="g48"><path id="path50" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.033,0.018 -0.075,0.015 -0.111,0.024 -1.543,-2.032 -2.921,-5.102 -5.49,-10.604 -1.356,-2.903 -2.42,-4.946 -3.116,-6.538 1.628,-0.225 3.285,1.443 3.946,3.272 0.673,1.866 3.215,5.652 4.926,7.778 C 1.867,-3.941 1.716,-0.924 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M23.283 23.275s1.374 1.635 2.733 10.047c.143.883.201 1.775.217 2.678H36V7.448C31.613 3.975 25.601 3.259 18.322 5.69c0 0-5.408-3-6.147-3.739-.719-.72-1.857-1.556-1.235.35.364 1.112.764 2.373 2.358 4.862-3.436 2.036-4.513 4.68-8.558 13.341C1.652 27.12.08 29.269.937 31.797c1.13 3.337 5.316 5.595 8.844 3.021 1.919-1.4 2.246-3.913 6.225-6.223 3.653-.065 7.277-1.604 7.277-5.32z"/><path fill="#292F33" d="M36 6.012C27.665.301 14.354 1.473 15.909 6.19 25.51 4.328 31.77 7.731 36 13.358V6.012z"/><path fill="#292F33" d="M19.663 5.763c-2.878.233-7.157 1.595-9.296 3.967 0 0-.129-5.147 3.566-5.614 6.172-.779 5.809.363 5.809.363l-.079 1.284z"/><path fill="#C1694F" d="M16.357 1.056c.558 1.155 4.006 1.79 5.056 6.029 1.051 4.24-3.134 2.951-4.356.855-1.361-2.334-1.828-4.162-1.867-5.679-.021-.801.039-3.538 1.167-1.205z"/><path fill="#662113" d="M16.596 2.838c1.103.968 2.448 2.472 2.65 3.955.202 1.483-1.125.988-1.736-.372-.612-1.359-.753-2.779-1.134-3.233-.38-.454.22-.35.22-.35z"/><path fill="#292F33" d="M16.94 15.525c0 .687-.557 1.244-1.245 1.244-.687 0-1.244-.557-1.244-1.244 0-.688.557-1.245 1.244-1.245.688.001 1.245.558 1.245 1.245z"/><path fill="#662113" d="M4.222 29.917c0 .881-.532 1.594-1.187 1.594s-1.187-.713-1.187-1.594c0-.882.532-1.596 1.187-1.596s1.187.714 1.187 1.596z"/><path fill="#D99E82" d="M10.354 9.924c-.033-.017-.075-.014-.111-.024-1.543 2.033-2.92 5.102-5.49 10.604-1.356 2.903-2.42 4.946-3.116 6.538 1.628.226 3.285-1.442 3.945-3.271.673-1.866 3.215-5.652 4.927-7.778 1.712-2.127 1.561-5.144-.155-6.069z"/></svg> \ No newline at end of file |