about summary refs log tree commit diff
path: root/public/emoji/1f92f.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f92f.svg
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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/1f92f.svg')
-rw-r--r--public/emoji/1f92f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f92f.svg b/public/emoji/1f92f.svg
index 03198605d..664d96059 100644
--- a/public/emoji/1f92f.svg
+++ b/public/emoji/1f92f.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="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="m 11.9277,29.7708 10.0971,0 0,-4.991 -10.0971,0 0,4.991 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(30,12)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.628 -5.372,-12 -12,-12 -6.627,0 -12,5.372 -12,12 0,6.627 5.373,12 12,12 C -5.372,12 0,6.627 0,0"/></g><g transform="translate(13.5,24.2108)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.386,0.441 1.647,-0.069 2,-0.461 2.353,-0.853 6.658,-1.352 6.5,-0.8 6,0.951 7.5,1.775 7.765,1.194 7.909,0.878 7.574,-0.368 7.733,-0.484 8.167,-0.8 8.671,-0.268 9.02,-0.461 9.633,-0.8 8.614,-2.3 8.614,-2.3 L 0.59,-3.011 c 0,0 -0.983,2.562 -0.59,3.011"/></g><g transform="translate(22.114,19.7)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -1.842,-1.5 -4.114,-1.5 -2.272,0 -4.114,0.672 -4.114,1.5 0,0.828 1.842,1.5 4.114,1.5 C -1.842,1.5 0,0.828 0,0"/></g><g transform="translate(14.0833,29.1319)" id="g32"><path id="path34" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.56,-1.736 1.917,-7.132 0.56,-9.432 0.559,-0.868 1.678,-1.117 3.357,-1.117 l 0,11.417"/></g><g transform="translate(21.9167,29.1319)" id="g36"><path id="path38" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.56,-1.736 -1.917,-7.132 -0.56,-9.432 -0.559,-0.868 -1.678,-1.117 -3.357,-1.117 l 0,11.417"/></g><g transform="translate(15,31.5)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(13,29.5)" id="g44"><path id="path46" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(20,32.5)" id="g48"><path id="path50" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g id="g52"><g id="g54"/><g id="g60"><g style="opacity:0.28999299" id="g62" clip-path="url(#clipPath56)"><g id="g64" transform="translate(21.898,28.7917)"><path id="path66" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.047,0.078 0.073,0.251 0.127,0.33 -1.354,0.324 -2.723,0.649 -2.754,0.649 -0.063,0 -7.063,-0.812 -7.25,-0.854 -0.182,-0.04 -0.042,0.625 -0.042,0.625 0,0 1.283,-2.435 2.584,-2.833 0.18,-0.056 0.476,-1.314 0.499,-1.929 0.624,0.018 1.006,0.176 1.584,0.637 0.375,-0.25 1.333,-0.417 1.812,0.083 0.402,-0.201 1.577,-0.411 2.667,0.36 C -0.647,-1.857 -0.245,-0.405 0,0"/></g></g></g></g><g transform="translate(18,30.5)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(18,33.5)" id="g72"><path id="path74" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(18.125,29.2569)" id="g76"><path id="path78" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.791 -1.452,-3.243 -3.243,-3.243 -1.791,0 -3.243,1.452 -3.243,3.243 0,1.791 1.452,3.243 3.243,3.243 C -1.452,3.243 0,1.791 0,0"/></g><g transform="translate(22,29.5)" id="g80"><path id="path82" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(26,30.5)" id="g84"><path id="path86" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(28,30)" id="g88"><path id="path90" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 -1.105,0 -2,0.895 -2,2 0,1.105 0.895,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(24,31.5)" id="g92"><path id="path94" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(16,30.5)" id="g96"><path id="path98" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(18,32.5)" id="g100"><path id="path102" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(20,30.5)" id="g104"><path id="path106" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(15.875,28.7917)" id="g108"><path id="path110" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.829 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(11.8333,29.867)" id="g112"><path id="path114" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.741 -0.6,-1.341 -1.341,-1.341 -0.741,0 -1.342,0.6 -1.342,1.341 0,0.741 0.601,1.341 1.342,1.341 C -0.6,1.341 0,0.741 0,0"/></g><g transform="translate(18.0617,29.7708)" id="g116"><path id="path118" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.829 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.829 0,0"/></g><g transform="translate(25,30.5)" id="g120"><path id="path122" style="fill:#f4abba;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.828 -0.672,-1.5 -1.5,-1.5 -2.328,-1.5 -3,-0.828 -3,0 -3,0.828 -2.328,1.5 -1.5,1.5 -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(14.0833,21.4512)" id="g124"><path id="path126" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.197,0.46 0.011,1.555 0.548,1.137 1.085,0.719 0.789,-0.231 1.417,-0.24 2.044,-0.25 2.221,1.201 2.917,1.24 3.613,1.279 3.966,-0.211 4.417,-0.093 4.868,0.024 4.75,0.652 5.26,0.534 5.77,0.417 5.652,-0.62 6.175,-0.366 6.698,-0.113 6.69,1.277 7.25,1.337 7.809,1.397 7.468,0.111 8.031,0.46 8.593,0.809 8.506,0.026 7.941,-0.406 7.378,-0.838 4.735,-1.956 1.958,-1.24 -0.819,-0.525 0.197,-0.46 0,0"/></g><g transform="translate(22.6666,18)" id="g128"><path id="path130" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.421,0 0,3.2 L 0.478,2.618 0,0 Z"/></g><g transform="translate(15,15)" id="g132"><path id="path134" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.105 -0.672,-2 -1.5,-2 -2.329,-2 -3,-1.105 -3,0 -3,1.105 -2.329,2 -1.5,2 -0.672,2 0,1.105 0,0"/></g><g transform="translate(24,15.0001)" id="g136"><path id="path138" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.105 -0.672,-2 -1.5,-2 -2.328,-2 -3,-1.105 -3,0 -3,1.104 -2.328,2 -1.5,2 -0.672,2 0,1.104 0,0"/></g><g transform="translate(21.5,6.7222)" id="g140"><path id="path142" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-2.21 -1.568,-4 -3.5,-4 -5.433,-4 -7,-2.21 -7,0 -7,2.209 -5.433,4 -3.5,4 -1.568,4 0,2.209 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCB4C" d="M35 18.619c0-3.794-3.075-6.869-6.869-6.869-.979 0-2.752.578-2.752.578l-13.126 1.384s-2.717-1.581-4.383-1.581C4.075 12.131 1 15.206 1 19c0 .237.012.471.035.702C1.406 28.763 8.849 36 18 36c9.389 0 17-7.611 17-17 0-.052-.009-.101-.012-.153.003-.076.012-.151.012-.228z"/><ellipse fill="#65471B" cx="18" cy="28.638" rx="4.332" ry="4.95"/><path fill="#65471B" d="M14 20.606c0 1.473-.896 2.667-2 2.667-1.105 0-2-1.194-2-2.667 0-1.473.895-2.667 2-2.667 1.104 0 2 1.194 2 2.667zm12-.001c0 1.473-.895 2.667-2 2.667s-2-1.194-2-2.667c0-1.472.896-2.667 2-2.667 1.105.001 2 1.195 2 2.667z"/><path fill="#F19020" d="M6.266 13.688c.25-.188 1.113-.512 1.716.051 1.018.949 1.265-1.445 4.477.303 1.469.799 8.989.96 9.699.607 2.692-1.337 4.768-2.198 5.572-1.743.624.353-.973.955.195 1.092 1.193.14 1.261-.49 2.202-.246 1.655.429-1.094 2.324-1.094 2.324-4.357 3.575-19.429.903-22.089-.776-1.099-.694-1.064-1.323-.678-1.612z"/><path fill="#D93047" d="M29.688 9.115L18 7.812 5.938 9.115c3.656 3.667 4.844 7.917 4.844 7.917l4.437.892 9.501.014c-.001 0 1.53-5.782 4.968-8.823z"/><path fill="#C02334" d="M29.306 9.435c1.281-1.263-4.775-1.821-9.587-1.821S11.36 8.666 11.36 8.666s-5.092.784-4.395 1.557c.988 1.094 2.2 3.153 2.2 3.153s4.757 2.405 8.351-.626c2.5 1.5 6 .969 7.562-1.609 0 0 1.217.453 2.451.531 0 0 .953-1.425 1.777-2.237z"/><path fill="#FFCB4C" d="M29.609 15.646c-1.749 1.262-2.091-.253-3.685-.253-1.115 0-1.231.606-2.789 1.328-.957.444-2.326-.764-3.176-.764-1.15 0-2.217 1.553-3.719.73-.84-.46-1.487-1.259-2.623-1.229-1.955.052-1.914.954-3.652.664-4.48-.749-4.355-2.374-4.355-2.374l-.658 4.233h9.382l3.792 1.798 4.458-1.798h5.493s.641-.178 1.094-.342c1.584-.571 1.773-2.956.438-1.993z"/><path fill="#E8596E" d="M31.125 3.725c-.24 0-.467.045-.686.109-.688-.845-1.723-1.396-2.898-1.396-.087 0-.169.02-.255.026-.734-.827-1.794-1.359-2.987-1.359-1.505 0-2.8.839-3.486 2.066-.346-.798-1.139-1.357-2.064-1.357-.718 0-1.349.342-1.761.865C16.48 1.209 15.1.147 13.458.147c-1.323 0-2.48.689-3.148 1.723-.184-.029-.368-.058-.56-.058-1.432 0-2.661.812-3.293 1.992-.203-.038-.41-.063-.624-.063-1.864 0-3.375 1.511-3.375 3.375s1.511 3.375 3.375 3.375c.588 0 1.135-.159 1.614-.425.376.282.838.456 1.345.456.145 0 .285-.016.422-.043.855 1.379 2.367 2.303 4.109 2.303 1.709 0 3.206-.885 4.073-2.217.72.882 1.802 1.457 3.029 1.457 1.815 0 3.327-1.238 3.776-2.911.034.001.065.01.099.01.283 0 .559-.031.826-.087.654.556 1.491.904 2.417.904 1.174 0 2.21-.551 2.897-1.396.219.064.446.109.686.109 1.36 0 2.463-1.103 2.463-2.463s-1.104-2.463-2.464-2.463z"/><circle fill="#F3AAB9" cx="27.795" cy="5.767" r="2.121"/><path fill="#F3AAB9" d="M19.876 5.903c0-1.193-.967-2.161-2.16-2.161-.368 0-.71.101-1.013.263-.251-.601-.844-1.024-1.537-1.024-.567 0-1.067.285-1.368.718-.67-.623-1.561-1.013-2.548-1.013-1.755 0-3.216 1.21-3.625 2.838-.365-.367-.87-.595-1.429-.595-1.111 0-2.012.901-2.012 2.012s.901 2.012 2.012 2.012c.703 0 1.319-.361 1.679-.907.517 1.081 1.529 1.873 2.749 2.079.39.67 1.107 1.125 1.938 1.125 1.074 0 1.969-.754 2.193-1.76.324.18.691.292 1.087.292 1.07 0 1.962-.749 2.19-1.75 1.042-.155 1.844-1.044 1.844-2.129z"/></svg>
\ No newline at end of file