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/1f32d.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/1f32d.svg')
| -rw-r--r-- | public/emoji/1f32d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f32d.svg b/public/emoji/1f32d.svg index e4c7c5b61..a450dbba0 100644 --- a/public/emoji/1f32d.svg +++ b/public/emoji/1f32d.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(31.4203,4.5294)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.515,-3.515 -9.213,-3.515 -12.728,0 L -26.87,14.142 c -3.515,3.515 -3.515,9.213 0,12.728 3.515,3.515 9.213,3.515 12.728,0 L 0,12.728 C 3.515,9.213 3.515,3.515 0,0"/></g><g transform="translate(29.3346,15.1005)" id="g24"><path id="path26" style="fill:#f7bba6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.515,-3.515 4.609,-8.119 2.475,-10.253 -2.135,-2.134 -6.739,-1.04 -10.253,2.475 L -21.92,6.364 c -3.515,3.515 -4.609,8.119 -2.475,10.253 2.134,2.134 6.738,1.04 10.253,-2.475 L 0,0 Z"/></g><g transform="translate(33.1669,7.0255)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.415,-1.415 1.611,-3.51 0.44,-4.682 -1.172,-1.171 -3.268,-0.976 -4.683,0.439 l -26.191,26.192 c -1.415,1.414 -1.611,3.511 -0.44,4.682 1.171,1.172 3.268,0.975 4.682,-0.439 L 0,0 Z"/></g><g transform="translate(5.2574,32.1066)" id="g32"><path id="path34" style="fill:none;stroke:#ffcc4d;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 2.238,-2.238 0.824,-3.652 3.062,-5.89 2.237,-2.238 3.651,-0.823 5.889,-3.061 2.237,-2.237 0.823,-3.652 3.061,-5.889 2.24,-2.24 3.654,-0.826 5.893,-3.065 2.242,-2.242 0.827,-3.656 3.069,-5.897 2.241,-2.241 3.655,-0.827 5.896,-3.068"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M31.42 31.471c-3.515 3.515-9.213 3.515-12.728 0L4.55 17.328c-3.515-3.515-3.515-9.213 0-12.728 3.515-3.515 9.213-3.515 12.728 0L31.42 18.743c3.515 3.514 3.515 9.213 0 12.728z"/><path fill="#F7BBA6" d="M29.335 20.9c3.515 3.515 4.609 8.119 2.475 10.253-2.135 2.134-6.739 1.039-10.253-2.475L7.414 14.536c-3.515-3.515-4.609-8.12-2.475-10.253 2.134-2.134 6.738-1.04 10.253 2.475L29.335 20.9z"/><path fill="#DD2E44" d="M33.167 28.974c1.415 1.415 1.611 3.51.44 4.682-1.172 1.171-3.267.975-4.682-.44L2.732 7.025c-1.414-1.414-1.61-3.51-.439-4.682 1.171-1.171 3.268-.975 4.682.439l26.192 26.192z"/><path fill="#FFCC4D" d="M32.127 31.764c-.256 0-.512-.098-.707-.293-.916-.916-1.598-1.07-2.462-1.266-.988-.224-2.109-.478-3.435-1.803s-1.578-2.446-1.802-3.435c-.195-.863-.35-1.546-1.266-2.462-.915-.915-1.597-1.069-2.46-1.264-.989-.224-2.11-.477-3.434-1.801-1.323-1.324-1.576-2.444-1.799-3.432-.194-.862-.348-1.543-1.262-2.458-.914-.914-1.595-1.067-2.457-1.262-.988-.223-2.108-.476-3.432-1.799-1.322-1.322-1.575-2.442-1.798-3.43-.195-.863-.348-1.544-1.263-2.458-.391-.39-.391-1.023 0-1.414s1.023-.391 1.414 0c1.324 1.323 1.577 2.443 1.8 3.432.195.862.348 1.543 1.263 2.458.914.914 1.595 1.067 2.457 1.262.988.223 2.108.476 3.432 1.799 1.324 1.324 1.576 2.444 1.799 3.432.194.862.348 1.543 1.262 2.458.916.916 1.597 1.07 2.46 1.264.988.224 2.109.477 3.434 1.801 1.325 1.325 1.578 2.446 1.802 3.435.195.863.35 1.546 1.266 2.462s1.599 1.07 2.462 1.266c.989.224 2.11.478 3.435 1.803.391.391.391 1.023 0 1.414-.197.193-.453.291-.709.291z"/></svg> \ No newline at end of file |
