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/1f36b.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/1f36b.svg')
-rw-r--r-- | public/emoji/1f36b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f36b.svg b/public/emoji/1f36b.svg index 1ac9c24d2..a993c9b4b 100644 --- a/public/emoji/1f36b.svg +++ b/public/emoji/1f36b.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 10.076,34.324 1.59,25.839 c -1.562,-1.562 -1.562,-2.681 0,-4.243 l 0,0 19.092,-19.092 c 1.562,-1.562 4.094,-1.562 5.657,0 l 0,0 7.071,7.071 c 1.561,1.562 1.561,4.095 0,5.657 l 0,0 -19.092,19.092 c -0.781,0.781 -1.451,1.172 -2.122,1.172 l 0,0 c -0.67,0 -1.34,-0.391 -2.12,-1.172"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath52" clipPathUnits="userSpaceOnUse"><path id="path54" d="m 19.267,25.132 -8.484,-8.486 c -1.562,-1.562 -1.562,-4.095 0,-5.657 l 0,0 9.899,-9.899 C 21.258,0.515 21.965,0.151 22.706,0 l 0,0 1.608,0 c 0.742,0.151 1.449,0.515 2.025,1.09 l 0,0 8.486,8.485 c 1.561,1.562 1.561,4.095 0,5.657 l 0,0 -9.9,9.9 c -0.782,0.781 -1.805,1.171 -2.829,1.171 l 0,0 c -1.023,0 -2.047,-0.39 -2.829,-1.171"/></clipPath><clipPath id="clipPath64" clipPathUnits="userSpaceOnUse"><path id="path66" 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(26.3389,2.5039)" id="g20"><path id="path22" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.562,-1.562 -4.095,-1.562 -5.657,0 l -19.092,19.092 c -1.562,1.562 -1.562,2.681 0,4.243 l 8.485,8.485 c 1.562,1.562 2.681,1.562 4.243,0 L 7.071,12.729 c 1.562,-1.563 1.562,-4.095 0,-5.658 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(31.9961,5.333)" id="g32"><path id="path34" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -20.299,20.299 5.863,5.864 -1.414,1.414 -5.863,-5.864 -4.451,4.45 -1.414,-1.414 4.451,-4.45 -7.572,-7.572 1.414,-1.414 7.572,7.572 L -1.414,-1.414 0,0 Z"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(26.3389,1.0898)" id="g44"><path id="path46" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.562,-1.561 -4.095,-1.561 -5.657,0 l -9.899,9.9 c -1.562,1.562 -1.562,4.094 0,5.657 l 8.485,8.485 c 1.562,1.562 4.094,1.562 5.657,0 l 9.899,-9.899 c 1.562,-1.563 1.562,-4.095 0,-5.658 L 0,0 Z"/></g></g></g><g id="g48"><g clip-path="url(#clipPath52)" id="g50"><g transform="translate(26,26)" id="g56"><path id="path58" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9,-23 -6,3 13,21 2,-1 z"/></g></g></g><g id="g60"><g clip-path="url(#clipPath64)" id="g62"><g transform="translate(22.8037,27.2529)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.707,-0.707 1.414,-1.414 2.121,-2.121 -0.707,-2.122 -8.485,-15.557 -9.9,-18.385 0,0 -0.707,-2.121 -2.474,-0.353 -1.242,1.241 -3.703,3.702 -5.304,5.303 -0.679,0.679 -0.685,2.143 0,2.828 C -11.982,-9.154 -3.422,-0.593 -2.829,0 -1.415,1.415 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C1694F" d="M26.339 33.496c-1.562 1.561-4.095 1.561-5.657 0L1.59 14.404c-1.562-1.562-1.562-2.681 0-4.243l8.485-8.485c1.562-1.562 2.681-1.562 4.243 0L33.41 20.768c1.562 1.562 1.562 4.095 0 5.657l-7.071 7.071z"/><path fill="#8A4B38" d="M16.582 15.253l-4.885-4.885 5.657-5.657-1.415-1.414-5.656 5.657L6.54 5.211 5.126 6.626l3.743 3.742-5.657 5.657 1.414 1.414 5.657-5.657 4.885 4.885z"/><path fill="#DD2E44" d="M26.339 34.91c-1.562 1.562-4.095 1.562-5.657 0l-9.899-9.899 14.142-14.142 9.899 9.899c1.562 1.562 1.562 4.095 0 5.657l-8.485 8.485z"/><path fill="#BE1931" d="M12.825 27.053l4.673 4.674 7.955-20.33-.528-.529-1.504-.932z"/><path fill="#CCD6DD" d="M22.804 8.747l2.121 2.121c-.707 2.122-8.485 15.557-9.9 18.385 0 0-.707 2.121-2.475.354l-5.304-5.304c-.679-.679-.685-2.142 0-2.828L19.975 8.747c1.414-1.414 2.829 0 2.829 0z"/></svg> \ No newline at end of file |