about summary refs log tree commit diff
path: root/public/emoji/1f95f.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/1f95f.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/1f95f.svg')
-rw-r--r--public/emoji/1f95f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f95f.svg b/public/emoji/1f95f.svg
index 9044b3998..57f13af88 100644
--- a/public/emoji/1f95f.svg
+++ b/public/emoji/1f95f.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(1.4426,22.3418)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.03,0.715 2.03,1.58 2.285,2.54 2.539,3.499 5.47,4.853 5.964,4.51 6.458,4.168 7.039,4.497 7.335,5.254 c 0.296,0.757 3.476,2.541 4.244,2.093 0.768,-0.447 2.095,-0.028 2.558,0.458 0.464,0.486 3.891,0.542 4.29,-0.19 0.4,-0.732 1.061,-0.596 1.858,-0.268 0.796,0.329 3.266,0.29 3.586,-0.391 0.321,-0.681 1.161,-1.12 1.772,-0.941 C 26.254,6.194 28.61,5.58 28.364,4.691 28.119,3.802 28.682,3.16 29.51,3.205 30.338,3.249 31.81,1.544 31.666,1.12 31.521,0.695 32.084,0.175 32.653,-0.077 33.221,-0.329 33.363,-2.606 31.789,-3.188 30.216,-3.771 4.813,-6.034 2.836,-3.822 0.858,-1.61 0,0 0,0"/></g><g transform="translate(20.8897,23.164)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.48,-4.459 -3.09,-7.96 -4.838,-7.752 -1.749,0.208 -2.777,3.991 -2.297,8.45 0.48,4.457 1.589,7.388 3.909,7.388 C -0.674,8.086 0.48,4.457 0,0"/></g><g transform="translate(25.97,22.8071)" id="g28"><path id="path30" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.48,-4.459 -3.09,-7.96 -4.838,-7.752 -1.749,0.208 -2.777,3.991 -2.297,8.45 0.48,4.457 1.824,5.906 4.036,6.642 C -0.227,8.294 0.48,4.457 0,0"/></g><g transform="translate(28.2125,20.1733)" id="g32"><path id="path34" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.624,-4.15 -4.101,-7.009 -5.535,-6.388 -1.433,0.621 -0.905,4.346 0.342,8.636 1.671,5.745 4.58,6.607 6.014,5.986 C 2.254,7.613 1.623,4.148 0,0"/></g><g transform="translate(29.3347,17.6945)" id="g36"><path id="path38" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.794,-3.391 -6.008,-5.273 -7.179,-4.203 -8.35,-3.135 -7.037,0.479 -4.243,3.869 -1.45,7.26 1.799,8.427 3.191,7.707 5.115,6.711 2.794,3.389 0,0"/></g><g transform="translate(29.2322,15.1505)" id="g40"><path id="path42" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4.118,-1.167 -7.832,-0.649 -8.294,1.159 -8.756,2.966 -5.795,5.378 -1.677,6.545 2.441,7.713 5.867,7.872 6.617,5.386 7.155,3.603 4.117,1.167 0,0"/></g><g transform="translate(16.9221,23.9574)" id="g44"><path id="path46" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.384,4.245 -3.912,6.918 -6.156,6.013 -8.591,5.031 -9.058,1.321 -7.675,-2.923 -6.293,-7.167 -2.613,-9.884 -1.146,-9.355 0.32,-8.826 1.383,-4.243 0,0"/></g><g transform="translate(11.6969,22.3535)" id="g48"><path id="path50" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.715,3.461 -5.176,6.257 -7.081,4.385 -8.97,2.528 -8.149,-1.524 -5.434,-4.984 -2.721,-8.445 1.554,-9.184 2.75,-8.145 3.945,-7.107 2.715,-3.46 0,0"/></g><g transform="translate(8.4144,21.1716)" id="g52"><path id="path54" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -6.326,2.947 -7.706,1.047 -8.257,-0.478 -8.809,-2.002 -5.958,-5.514 -1.973,-7.111 2.011,-8.711 5.69,-8.77 6.243,-7.245 6.794,-5.722 3.899,-1.817 0,0"/></g><g transform="translate(35.6495,11.9644)" id="g56"><path id="path58" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-5.312 -7.752,-7.214 -17.315,-7.214 -9.563,0 -18.036,3.104 -18.036,8.416 0,5.313 8.473,14.429 18.036,14.429 C -7.752,15.631 0,5.312 0,0"/></g><g transform="translate(19.5367,19.3689)" id="g60"><path id="path62" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.989 -0.538,-5.411 -1.202,-5.411 -0.664,0 -1.203,2.422 -1.203,5.411 0,2.988 0.539,5.41 1.203,5.41 C -0.538,5.41 0,2.988 0,0"/></g><g transform="translate(24.2206,19.599)" id="g64"><path id="path66" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.513,-2.533 0.446,-4.683 -0.148,-4.803 -0.743,-4.924 -1.64,-2.969 -2.153,-0.436 -2.666,2.097 -2.6,4.247 -2.006,4.368 -1.41,4.488 -0.514,2.533 0,0"/></g><g transform="translate(28.0736,19.3759)" id="g68"><path id="path70" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.945,-1.944 1.269,-3.734 0.724,-4 0.178,-4.265 -1.03,-2.905 -1.976,-0.96 -2.921,0.983 -3.245,2.774 -2.7,3.039 -2.154,3.305 -0.946,1.944 0,0"/></g><g transform="translate(14.5808,19.4885)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.645,-2.701 -1.63,-4.78 -2.201,-4.644 -0.571,0.137 -0.511,2.436 0.134,5.138 0.645,2.701 1.739,4.304 2.31,4.167 C 0.814,4.525 0.645,2.701 0,0"/></g><g transform="translate(10.2579,19.1146)" id="g76"><path id="path78" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.868,-1.94 -2.018,-3.312 -2.573,-3.064 -0.554,0.248 -0.3,2.02 0.567,3.961 0.867,1.939 2.086,2.914 2.64,2.667 C 1.188,3.316 0.867,1.94 0,0"/></g><g transform="translate(12.8649,28.6806)" id="g80"><path id="path82" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.514,-0.603 0.618,-1.387 0.233,-1.751 -0.153,-2.115 -0.882,-1.92 -1.396,-1.317 -1.911,-0.714 -2.015,0.07 -1.629,0.434 -1.243,0.798 -0.514,0.603 0,0"/></g><g transform="translate(6.4727,25.2185)" id="g84"><path id="path86" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.263,-0.762 0.082,-1.53 -0.405,-1.716 -0.487,-0.186 -1.094,0.28 -1.358,1.042 -0.263,0.761 -0.082,1.53 0.405,1.716 C -0.871,1.228 -0.263,0.761 0,0"/></g><g transform="translate(2.9813,20.3151)" id="g88"><path id="path90" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.663,-0.572 0.935,-1.378 0.607,-1.799 0.278,-2.22 -0.526,-2.098 -1.189,-1.526 -1.853,-0.953 -2.124,-0.148 -1.796,0.273 -1.467,0.695 -0.663,0.572 0,0"/></g><g transform="translate(18.6717,29.5294)" id="g92"><path id="path94" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.514,-0.603 0.618,-1.387 0.233,-1.751 -0.153,-2.115 -0.882,-1.92 -1.396,-1.317 -1.911,-0.714 -2.015,0.07 -1.629,0.434 -1.243,0.798 -0.514,0.603 0,0"/></g><g transform="translate(25.0279,28.0989)" id="g96"><path id="path98" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.057,-0.92 -0.396,-1.7 -1.011,-1.742 -0.616,-0.043 -1.162,0.669 -1.219,1.588 -0.058,0.92 0.395,1.7 1.011,1.742 C -0.603,1.631 -0.057,0.92 0,0"/></g><g transform="translate(29.0921,26.074)" id="g100"><path id="path102" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.147,-0.795 -0.147,-1.524 -0.655,-1.628 -0.508,-0.104 -1.04,0.457 -1.186,1.252 -0.147,0.796 0.146,1.525 0.655,1.628 C -0.678,1.356 -0.147,0.795 0,0"/></g><g transform="translate(32.2595,22.6382)" id="g104"><path id="path106" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.333,-0.684 -0.976,-1.038 -1.437,-0.79 -0.461,0.248 -0.566,1.004 -0.233,1.688 0.333,0.685 0.976,1.038 1.437,0.79 C 0.228,1.44 0.333,0.684 0,0"/></g><g transform="translate(34.5436,18.8283)" id="g108"><path id="path110" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.414,-0.532 -1.118,-0.646 -1.572,-0.255 -0.453,0.392 -0.485,1.14 -0.07,1.672 0.414,0.532 1.118,0.646 1.571,0.254 C 0.383,1.28 0.415,0.532 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M1.443 13.658c1.03-.715 2.03-1.58 2.285-2.54s3.186-2.313 3.679-1.971c.493.344 1.075.014 1.371-.743.296-.757 3.476-2.541 4.244-2.093.768.448 2.095.028 2.558-.458.463-.486 3.891-.542 4.29.19s1.061.596 1.857.268c.797-.329 3.266-.289 3.587.391.321.681 1.161 1.12 1.772.941.611-.179 2.967.435 2.721 1.324-.245.889.317 1.531 1.146 1.486.828-.044 2.3 1.661 2.156 2.085-.144.424.418.945.987 1.197.569.252.71 2.529-.863 3.112-1.573.583-26.976 2.845-28.954.634-1.978-2.212-2.836-3.823-2.836-3.823z"/><path fill="#FFD983" d="M20.89 12.836c-.48 4.459-3.09 7.96-4.838 7.752-1.749-.208-2.777-3.991-2.297-8.45.48-4.457 1.589-7.388 3.909-7.388 2.552 0 3.705 3.629 3.226 8.086z"/><path fill="#FFD983" d="M25.97 13.193c-.48 4.459-3.09 7.96-4.838 7.752-1.749-.208-2.777-3.991-2.297-8.45.48-4.457 1.824-5.906 4.036-6.642 2.872-.954 3.579 2.883 3.099 7.34z"/><path fill="#FFD983" d="M28.212 15.827c-1.624 4.15-4.101 7.009-5.535 6.388-1.433-.621-.905-4.346.343-8.636 1.67-5.745 4.58-6.606 6.014-5.985 1.432.62.802 4.084-.822 8.233z"/><path fill="#FFD983" d="M29.335 18.306c-2.794 3.391-6.008 5.272-7.179 4.203-1.171-1.068.143-4.683 2.936-8.073 2.793-3.39 6.043-4.557 7.434-3.837 1.924.995-.398 4.317-3.191 7.707z"/><path fill="#FFD983" d="M29.232 20.85c-4.118 1.167-7.832.649-8.294-1.159-.462-1.806 2.499-4.219 6.617-5.386 4.117-1.168 7.544-1.327 8.294 1.159.539 1.783-2.499 4.219-6.617 5.386zm-12.31-8.807c-1.384-4.245-3.912-6.918-6.156-6.013-2.436.982-2.903 4.693-1.519 8.937 1.382 4.244 5.062 6.961 6.529 6.431 1.466-.53 2.53-5.112 1.146-9.355z"/><path fill="#FFD983" d="M11.697 13.646c-2.715-3.461-5.176-6.257-7.081-4.385-1.889 1.857-1.068 5.908 1.647 9.368 2.713 3.461 6.988 4.2 8.184 3.161 1.195-1.037-.035-4.684-2.75-8.144z"/><path fill="#FFD983" d="M8.414 14.828c-6.326-2.947-7.706-1.047-8.257.478-.552 1.524 2.3 5.035 6.285 6.633 3.984 1.6 7.663 1.658 8.215.134.552-1.523-2.344-5.428-6.243-7.245z"/><path fill="#FFD983" d="M35.65 24.036c0 5.312-7.752 7.214-17.315 7.214-9.563 0-18.036-3.105-18.036-8.417 0-5.312 8.473-14.429 18.036-14.429 9.562 0 17.315 10.319 17.315 15.632z"/><path fill="#FFAC33" d="M19.537 16.631c0 2.989-.538 5.411-1.202 5.411-.664 0-1.202-2.422-1.202-5.411 0-2.988.538-5.41 1.202-5.41.663 0 1.202 2.422 1.202 5.41zm4.684-.23c.513 2.533.446 4.683-.148 4.804-.595.12-1.492-1.834-2.006-4.368-.513-2.532-.447-4.683.148-4.803.595-.121 1.492 1.834 2.006 4.367zm3.853.223c.945 1.944 1.269 3.734.724 4-.546.265-1.754-1.095-2.7-3.04-.945-1.944-1.269-3.734-.724-4 .546-.265 1.754 1.097 2.7 3.04zm-13.493-.113c-.646 2.701-1.63 4.78-2.201 4.644-.571-.137-.51-2.436.134-5.137.645-2.701 1.738-4.304 2.309-4.167.572.136.403 1.96-.242 4.66zm-4.323.374c-.868 1.94-2.018 3.312-2.573 3.064-.554-.248-.3-2.02.567-3.961.867-1.94 2.086-2.915 2.64-2.667.554.249.233 1.625-.634 3.564z"/><path fill="#FFCC4D" d="M12.865 7.319c.514.603.618 1.387.233 1.751-.386.364-1.115.169-1.629-.434s-.618-1.387-.233-1.751c.385-.363 1.115-.169 1.629.434zm-6.392 3.462c.263.762.082 1.53-.405 1.716-.487.186-1.095-.28-1.358-1.042-.263-.762-.082-1.53.405-1.716.487-.185 1.095.281 1.358 1.042zm-3.492 4.904c.663.572.935 1.378.607 1.799-.328.421-1.132.299-1.796-.273-.663-.572-.935-1.378-.607-1.799.329-.422 1.133-.299 1.796.273zm15.691-9.214c.514.603.618 1.387.233 1.751-.386.364-1.115.169-1.629-.434s-.618-1.387-.233-1.751c.385-.364 1.115-.17 1.629.434z"/><ellipse transform="rotate(-3.242 23.923 7.975)" fill="#FFCC4D" cx="23.913" cy="7.978" rx="1.118" ry="1.668"/><path fill="#FFCC4D" d="M29.092 9.926c.147.795-.147 1.524-.655 1.628-.508.104-1.039-.457-1.186-1.252-.147-.795.147-1.524.655-1.628.508-.104 1.039.457 1.186 1.252zm3.167 3.436c-.333.684-.976 1.038-1.437.79s-.565-1.004-.233-1.688c.333-.684.976-1.038 1.437-.79.462.248.566 1.003.233 1.688zm2.285 3.81c-.414.532-1.118.646-1.572.255-.454-.391-.485-1.14-.071-1.671.415-.532 1.118-.646 1.572-.255.453.391.485 1.139.071 1.671z"/></svg>
\ No newline at end of file