about summary refs log tree commit diff
path: root/public/emoji/1f91e-1f3fb.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/1f91e-1f3fb.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/1f91e-1f3fb.svg')
-rw-r--r--public/emoji/1f91e-1f3fb.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91e-1f3fb.svg b/public/emoji/1f91e-1f3fb.svg
index 571240a9f..6e6cb494a 100644
--- a/public/emoji/1f91e-1f3fb.svg
+++ b/public/emoji/1f91e-1f3fb.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(25.3618,17.4869)" id="g20"><path id="path22" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.372,0.521 -0.534,0.654 -4.535,0.638 -8.632,12.557 C -9.246,12.032 -9.511,11.174 -9.218,10.37 l 1.72,-4.727 -0.004,-0.146 1.718,-4.89 -3.422,0.015 -0.222,-0.311 c -0.083,-0.031 -0.62,-0.313 -0.773,-0.44 -0.117,-0.097 -0.161,-0.136 -0.161,-0.136 0,0 -1.125,-0.534 -1.125,-2.407 0.044,-0.678 0.393,-1.534 0.719,-1.774 -0.359,-0.572 -0.996,-0.916 -1.594,-0.916 -1.104,0 -1.906,0.771 -1.906,1.875 l 0.295,7.176 C -14.79,3.325 -15.362,2.508 -15.362,1.556 l 0,-0.96 -0.109,-0.005 0,-4.161 c -0.156,-1.917 -1.975,-1.823 -1.975,-1.823 -1.058,0 -1.916,0.764 -1.916,1.823 l 0,-1.917 c 0,-0.094 0.015,-0.185 0.028,-0.276 0.515,-0.444 1.177,-0.818 1.91,-0.818 0,0 1.609,-0.093 2.575,1.266 0.123,-0.183 1.003,-1.281 2.487,-1.281 1.688,0 2.528,1.405 2.527,1.406 0.201,-0.115 0.473,-0.375 1.473,-0.375 l 2.297,0 c -2.031,-1.734 -2.875,-4.528 -2.875,-6.922 0,-0.276 0.302,-0.562 0.578,-0.562 0.277,0 0.578,0.286 0.578,0.562 0,2.548 0.899,4.642 2.299,5.891 1.139,1.015 2.623,1.031 2.623,1.031 0.277,0 0.578,0.302 0.578,0.578 0,0.276 -0.301,0.578 -0.578,0.578 l -5.5,0 c -1.104,0 -1.906,0.818 -1.906,1.922 0,1.105 0.802,1.906 1.906,1.906 l 8,0.016 c 0.766,0 1.519,-0.634 1.543,-0.664 C 0.896,-0.725 0.493,-0.303 0,0"/></g><g transform="translate(20.3325,30.6353)" id="g24"><path id="path26" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.628,1.165 0.135,0 2.033,-5.605 -0.002,-0.292 -0.513,-1.366 -0.072,0 L 0,-0.104 0,0 Z"/></g><g transform="translate(17,18)" id="g28"><path id="path30" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.703,0 -1.066,-0.202 -1.066,-0.202 L 0.864,5.129 2.731,0 0,0 Z"/></g><g transform="translate(7.916,20)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.168,0 c 1.059,0 1.916,-0.858 1.916,-1.917 l 0,-4.083 0,-0.083 C 2.084,-7.142 1.227,-8 0.168,-8 L 0,-8 c -1.059,0 -1.916,0.858 -1.916,1.917 l 0,0.083 0,4.083 C -1.916,-0.858 -1.059,0 0,0"/></g><g transform="translate(14.8344,17.0398)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.019,-0.02 -0.038,-0.041 -0.056,-0.062 -0.53,-0.59 -0.834,-1.273 -0.834,-2.04 c 0,-0.063 0.013,-0.123 0.017,-0.185 0.044,-0.678 0.308,-1.292 0.728,-1.774 -0.071,-0.129 -0.163,-0.243 -0.259,-0.353 -0.365,-0.417 -0.889,-0.688 -1.486,-0.688 -1.105,0 -2,0.896 -2,2 l 0,6 c 0,0.441 0.147,0.845 0.389,1.176 0.363,0.497 0.947,0.824 1.611,0.824 1.104,0 2,-0.895 2,-2 l 0,-0.957 0,-1.776 0,-0.045 C 0.105,0.127 0.056,0.06 0,0"/></g><g transform="translate(8.0625,11)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.024,0 1.925,0.526 2.45,1.322 2.573,1.14 2.721,0.977 2.881,0.825 2.93,0.779 2.983,0.74 3.036,0.697 3.155,0.599 3.279,0.509 3.413,0.429 3.479,0.39 3.545,0.354 3.614,0.32 3.754,0.251 3.899,0.195 4.05,0.148 4.117,0.128 4.181,0.103 4.25,0.087 4.472,0.034 4.7,0 4.937,0 5.174,0 5.398,0.036 5.618,0.089 5.694,0.106 5.767,0.131 5.841,0.155 5.977,0.199 6.109,0.254 6.236,0.316 6.318,0.356 6.399,0.393 6.477,0.44 6.641,0.54 6.795,0.653 6.937,0.781 6.979,0.82 7.008,0.871 7.048,0.911 7.2,1.063 7.351,1.217 7.467,1.399 7.466,1.4 7.465,1.401 7.464,1.402 7.665,1.287 7.937,1 8.938,1 l 2.537,0 C 11.105,0.721 10.767,0.377 10.451,0 9.223,-1.467 8.438,-3.606 8.438,-6 c 0,-0.276 0.223,-0.5 0.5,-0.5 0.276,0 0.5,0.224 0.5,0.5 0,2.548 0.956,4.775 2.377,6 0.731,0.631 1.584,1 2.498,1 l 0.125,0 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 l -1.5,0 -4,0 C 7.833,2 6.937,2.896 6.937,4 c 0,1.104 0.896,2 2.001,2 l 7.999,0 C 16.97,6 17,5.992 17.032,5.99 17.104,5.987 17.176,5.981 17.248,5.969 17.31,5.959 17.37,5.947 17.43,5.932 c 0.063,-0.017 0.125,-0.035 0.186,-0.058 0.062,-0.022 0.122,-0.047 0.181,-0.075 0.057,-0.027 0.111,-0.058 0.165,-0.09 0.056,-0.033 0.109,-0.067 0.161,-0.106 0.052,-0.038 0.102,-0.08 0.15,-0.124 0.046,-0.042 0.09,-0.084 0.132,-0.13 0.027,-0.029 0.051,-0.061 0.076,-0.091 0.017,-0.021 0.035,-0.041 0.052,-0.063 0.038,-0.05 0.073,-0.102 0.106,-0.156 0.034,-0.056 0.064,-0.112 0.093,-0.171 0.03,-0.061 0.056,-0.125 0.08,-0.19 0.011,-0.031 0.028,-0.06 0.039,-0.093 L 19.937,1 C 20.04,0.665 20.416,-0.871 20.348,-1.191 20.348,-6 15.652,-11 9.938,-11 3.4,-11 -1.906,-5.769 -2.049,0.734 -2.044,0.731 -2.039,0.728 -2.035,0.724 -1.52,0.279 -0.858,0 -0.125,0 L 0,0 Z"/></g><g transform="translate(21.2261,32.293)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.445,0.903 1.501,1.35 2.468,0.998 3.506,0.621 4.042,-0.527 3.664,-1.565 l 0,-0.001 -1.762,-4.821 -10e-4,-0.003 0,0 -2.167,5.897 L 0,0 Z"/></g><g transform="translate(25.0012,18)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.388,6.537 -2.07,5.688 c -0.054,0.149 -0.128,0.284 -0.211,0.41 -0.497,0.759 -1.463,1.109 -2.353,0.785 -0.641,-0.233 -1.089,-0.762 -1.25,-1.376 -0.099,-0.379 -0.089,-0.791 0.055,-1.187 L -4.268,0 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E0AA94" d="M25.362 18.513l-.372-.521-.161-.132-4.001.016-4.098-11.92c-.613.525-.879 1.383-.586 2.187l1.721 4.727-.005.145 1.719 4.891-3.422-.016-.223.311c-.083.031-.62.313-.773.44l-.161.137s-1.125.534-1.125 2.407c.044.678.392 1.534.719 1.774-.359.572-.996.916-1.594.916-1.104 0-1.906-.771-1.906-1.875l.295-7.176c-.817.364-1.389 1.181-1.389 2.133v.96l-.109.005v4.161C9.734 24 7.916 23.906 7.916 23.906 6.857 23.906 6 23.142 6 22.083V24c0 .095.015.185.028.276.515.445 1.177.818 1.91.818 0 0 1.609.094 2.575-1.266.123.183 1.003 1.281 2.487 1.281 1.688 0 2.527-1.405 2.526-1.406.201.115.474.375 1.474.375h2.297c-2.031 1.734-2.875 4.528-2.875 6.922 0 .276.302.562.578.562s.578-.286.578-.562c0-2.548.899-4.642 2.299-5.891 1.139-1.016 2.623-1.031 2.623-1.031.276 0 .578-.302.578-.578 0-.276-.302-.578-.578-.578H17c-1.104 0-1.906-.817-1.906-1.922s.802-1.906 1.906-1.906l8-.016c.766 0 1.518.633 1.543.664-.286-.504-.689-.926-1.181-1.229zM20.333 5.365L20.96 4.2h.135l2.033 5.604-.001.293-.514 1.366h-.072l-2.208-5.994z"/><path fill="#F7DECE" d="M17 18c-.703 0-1.066.202-1.066.202l1.931-5.331L19.731 18H17zm-9.084-2h.168C9.143 16 10 16.858 10 17.917v4.166C10 23.142 9.143 24 8.084 24h-.168C6.857 24 6 23.142 6 22.083v-4.166C6 16.858 6.857 16 7.916 16zm6.918 2.96l-.056.062C14.304 19.551 14 20.233 14 21c0 .063.013.123.018.185.044.678.308 1.292.728 1.774-.071.129-.163.243-.259.353-.366.417-.89.688-1.487.688-1.104 0-2-.896-2-2v-6c0-.441.147-.845.389-1.176.364-.497.947-.824 1.611-.824 1.104 0 2 .896 2 2v2.778c-.061.055-.109.123-.166.182z"/><path fill="#F7DECE" d="M8.062 25c1.024 0 1.925-.526 2.45-1.322.123.183.271.346.431.497.049.046.102.085.155.128.119.099.243.189.377.269.066.039.132.074.201.108.14.069.285.125.435.172.067.021.131.046.2.062.223.052.452.086.689.086.236 0 .461-.036.681-.089.076-.018.148-.042.223-.066.137-.044.269-.099.396-.161.082-.04.163-.076.24-.124.164-.1.318-.213.46-.341.043-.039.071-.09.112-.13.152-.152.303-.305.419-.488l-.003-.003C15.727 23.713 16 24 17 24h2.537c-.37.279-.708.623-1.024 1-1.228 1.467-2.013 3.606-2.013 6 0 .276.224.5.5.5s.5-.224.5-.5c0-2.548.956-4.775 2.377-6 .732-.631 1.584-1 2.498-1h.125c.276 0 .5-.224.5-.5s-.224-.5-.5-.5H17c-1.104 0-2-.896-2-2s.896-2 2-2h8c.032 0 .062.008.094.01.073.003.145.01.216.022.062.01.122.021.182.037.063.017.125.035.187.058.062.022.122.047.181.075.057.027.111.058.165.09.056.033.109.067.161.107.052.038.102.08.15.124.046.041.09.084.132.13.027.029.051.06.075.091l.052.063c.038.051.073.102.106.156.034.056.064.112.093.171.03.062.056.125.08.19.012.031.029.06.039.093L28 24c.103.335.479 1.871.411 2.191C28.411 31 23.715 36 18 36c-6.537 0-11.844-5.231-11.986-11.734l.014.01c.515.445 1.176.724 1.91.724h.124zM21.226 3.707c.445-.903 1.501-1.35 2.468-.998 1.038.377 1.573 1.525 1.195 2.563l-1.761 4.821-.001.003L20.96 4.2l.266-.493zM25.001 18l-2.388-6.537-2.07-5.688c-.054-.149-.128-.283-.211-.41-.497-.759-1.464-1.109-2.353-.785-.642.234-1.089.762-1.25 1.376-.099.379-.09.791.055 1.187L20.733 18h4.268z"/></svg>
\ No newline at end of file