about summary refs log tree commit diff
path: root/public/emoji/1f926-1f3ff-200d-2642-fe0f.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/1f926-1f3ff-200d-2642-fe0f.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/1f926-1f3ff-200d-2642-fe0f.svg')
-rw-r--r--public/emoji/1f926-1f3ff-200d-2642-fe0f.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f926-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f926-1f3ff-200d-2642-fe0f.svg
index cc2122284..e19ae7548 100644
--- a/public/emoji/1f926-1f3ff-200d-2642-fe0f.svg
+++ b/public/emoji/1f926-1f3ff-200d-2642-fe0f.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(27,9)" id="g20"><path id="path22" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -17,0 0,-9 21,0 0,5 C 4,-1.791 2.209,0 0,0"/></g><path id="path24" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(9,30.0625)" id="g26"><path id="path28" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-11.063 c 0,-4.97 4.029,-8.999 9,-8.999 4.971,0 9,4.029 9,8.999 L 18,-0.312 0,0 Z"/></g><g transform="translate(14,20)" id="g30"><path id="path32" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.448 -1,1 l 0,1 C -1,2.552 -0.552,3 0,3 0.552,3 1,2.552 1,2 L 1,1 C 1,0.448 0.552,0 0,0"/></g><g transform="translate(19,16.5)" id="g34"><path id="path36" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.276,0 -2.5,0.224 -2.5,0.5 -2.5,0.776 -2.276,1 -2,1 L 0,1 C 0.276,1 0.5,0.776 0.5,0.5 0.5,0.224 0.276,0 0,0"/></g><g transform="translate(10.8472,22.2848)" id="g38"><path id="path40" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.801,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.801,2.861 0,1.58 0,0"/></g><g transform="translate(28.7292,22.2848)" id="g42"><path id="path44" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.58 -0.8,-2.861 -1.788,-2.861 -0.988,0 -1.788,1.281 -1.788,2.861 0,1.58 0.8,2.861 1.788,2.861 C -0.8,2.861 0,1.58 0,0"/></g><g transform="translate(18,35.1772)" id="g46"><path id="path48" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -7.019,0 -10.139,-4.684 -10.139,-8.588 0,-3.903 1.343,-4.986 1.56,-3.903 0.78,3.903 3.119,5.102 3.119,5.102 4.68,-3.904 3.9,-0.781 3.9,-0.781 4.68,-4.684 2.34,0 2.34,0 1.56,-1.562 6.239,-1.562 6.239,-1.562 0,0 0.78,-1.198 1.56,-2.759 0.78,-1.561 1.56,0 1.56,3.903 C 10.139,-4.684 6.239,0 0,0"/></g><g transform="translate(15,12)" id="g50"><path id="path52" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-4 c 0,-1.657 1.343,-3 3,-3 1.657,0 3,1.343 3,3 L 6,0 0,0 Z"/></g><g transform="translate(18.734,17.6143)" id="g54"><path id="path56" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.827,-0.691 c 0,0 -6.529,-13.746 -7.413,-15.022 -0.884,-1.277 -1.87,-2.055 -4.57,-1.761 L 0,0 Z"/></g><path id="path58" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,0 -1,0 0,4 1,0 0,-4 z"/><g transform="translate(14.9844,7.6094)" id="g60"><path id="path62" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.359,-4.422 -2.865,-5.335 -0.276,-0.497 -1.305,-2.009 -2.322,-2.009 0,0 2.213,-0.121 3.121,1.682 1.285,2.553 1.957,3.787 2.425,4.646 0,0 -0.125,0.329 -0.203,0.485 C 0.039,-0.297 0,0 0,0"/></g><g transform="translate(18.734,17.6143)" id="g64"><path id="path66" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.084,-6.952 c 0.116,-0.047 0.231,-0.097 0.35,-0.139 l 0,-2.523 c 0,-0.594 0.178,-1.144 0.476,-1.61 2.195,4.449 5.085,10.533 5.085,10.533 L 0,0 Z"/></g><g transform="translate(13.5127,28.1537)" id="g68"><path id="path70" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.945,0.291 1.598,-0.508 1.77,-1.195 l 0.284,-1.14 0.756,2.155 c 0.365,1.042 1.507,1.591 2.549,1.225 l 3.774,-1.324 c 1.043,-0.365 1.591,-1.507 1.226,-2.549 l -2.648,-7.549 c 0,0 -0.331,-0.944 -1.275,-0.613 l -5.662,1.987 -0.612,1.274 0.345,0.984 -1.226,4.93 C -0.891,-1.127 -0.677,-0.208 0,0"/></g><g transform="translate(24.1566,19.6285)" id="g72"><path id="path74" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.026,0.058 -0.596,1.288 -1.747,1.529 l -0.49,-1.396 c 0.037,0.001 0.063,0.009 0.101,0.009 1.163,0 1.761,-0.422 1.774,-0.432 0.042,-0.031 0.093,-0.047 0.143,-0.047 0.053,0 0.106,0.018 0.149,0.052 C 0.015,-0.217 0.044,-0.1 0,0"/></g><g transform="translate(22.0209,21.2083)" id="g76"><path id="path78" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.417,0 -2.107,-1.515 -2.136,-1.58 -0.044,-0.099 -0.015,-0.215 0.07,-0.283 0.083,-0.068 0.204,-0.071 0.292,-0.007 0.006,0.005 0.578,0.397 1.673,0.424 l 0.489,1.395 C 0.264,-0.025 0.138,0 0,0"/></g><g transform="translate(20.9948,12.6362)" id="g80"><path id="path82" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.56,1.117 -1.678,1.681 -1.924,1.167 -2.194,0.603 -2.484,0 L 0,0 Z"/></g><g transform="translate(19.3171,14.3173)" id="g84"><path id="path86" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.377,0.191 -0.818,0.319 -1.322,0.319 -0.438,0 -0.819,-0.107 -1.161,-0.257 l -1.025,-1.743 2.701,0 C -0.516,-1.078 -0.246,-0.514 0,0"/></g><g transform="translate(12.5133,28.3432)" id="g88"><path id="path90" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.687,0.171 1.383,-0.247 1.555,-0.934 l 0.284,-1.14 0.755,2.155 c 0.366,1.042 1.508,1.591 2.55,1.225 l 3.774,-1.324 c 1.042,-0.366 1.591,-1.507 1.225,-2.549 l -2.648,-7.549 c 0,0 -0.331,-0.944 -1.274,-0.613 l -5.662,1.986 -0.613,1.275 0.346,0.984 -1.227,4.929 C -1.106,-0.867 -0.687,-0.171 0,0"/></g><g transform="translate(18.744,23.9463)" id="g92"><path id="path94" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.944,-0.331 2.599,4.387 1.655,4.718 0,0 Z"/></g><g transform="translate(15.9131,24.9394)" id="g96"><path id="path98" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.944,-0.331 2.599,4.387 1.655,4.718 0,0 Z"/></g><g transform="translate(14.2784,6.1499)" id="g100"><path id="path102" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.719,-3.579 -2.106,-4.416 -2.794,-5.9 -4.278,-6.15 -4.278,-6.15 c -8,0 -3.622,8.343 -3.622,8.343 L -1.469,14.039 5.072,11.459 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M27 27H10v9h21v-5c0-2.209-1.791-4-4-4z"/><path fill="#2A6797" d="M26 32h1v4h-1z"/><path fill="#7C533E" d="M9 5.938V17c0 4.971 4.029 9 9 9s9-4.029 9-9V6.25L9 5.938z"/><path fill="#C1694F" d="M19 19.5h-2c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2c.276 0 .5.224.5.5s-.224.5-.5.5z"/><path fill="#7C533E" d="M10.847 13.715c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.801-2.861 1.788-2.861s1.788 1.281 1.788 2.861zm17.882 0c0 1.58-.8 2.861-1.788 2.861s-1.788-1.281-1.788-2.861c0-1.58.8-2.861 1.788-2.861s1.788 1.281 1.788 2.861z"/><path fill="#0B0200" d="M18 .823c-7.019 0-10.139 4.684-10.139 8.588 0 3.903 1.343 4.986 1.56 3.903.78-3.903 3.12-5.101 3.12-5.101 4.68 3.904 3.9.781 3.9.781 4.679 4.684 2.34 0 2.34 0 1.56 1.562 6.239 1.562 6.239 1.562s.78 1.198 1.559 2.759c.78 1.562 1.56 0 1.56-3.903 0-3.905-3.9-8.589-10.139-8.589z"/><path fill="#7C533E" d="M15 24v4c0 1.657 1.343 3 3 3s3-1.343 3-3v-4h-6z"/><path fill="#2A6797" d="M18.734 18.386l1.827.691s-6.529 13.746-7.413 15.022c-.884 1.276-1.87 2.055-4.57 1.76l10.156-17.473zM26 32h1v4h-1z"/><path fill="#583529" d="M18.734 18.386l-4.084 6.952c.117.047.231.097.35.139V28c0 .594.178 1.144.476 1.61 2.195-4.449 5.085-10.533 5.085-10.533l-1.827-.691z"/><path fill="#583529" d="M13.513 7.846c.945-.291 1.598.508 1.77 1.195l.284 1.14.756-2.155c.366-1.042 1.507-1.591 2.549-1.225l3.774 1.324c1.042.366 1.591 1.507 1.225 2.549l-2.648 7.549s-.331.944-1.275.613l-5.662-1.986-.613-1.275.345-.984-1.226-4.929c-.17-.688.044-1.607.721-1.816z"/><path fill="#3D2E24" d="M24.157 16.371c-.026-.058-.596-1.288-1.747-1.529l-.49 1.395c.037-.001.063-.009.101-.009 1.162 0 1.76.422 1.774.432.042.032.093.047.143.047.053 0 .106-.018.149-.052.085-.067.114-.184.07-.284z"/><path d="M22.021 14.792c-1.417 0-2.107 1.515-2.136 1.58-.044.099-.016.215.069.283.084.068.204.07.292.007.005-.004.578-.397 1.673-.423l.49-1.395c-.124-.027-.25-.052-.388-.052z"/><path fill="#3D2E24" d="M20.995 23.364s-.56-1.117-1.678-1.681c-.246.514-.516 1.078-.807 1.681h2.485z"/><path d="M19.317 21.683c-.377-.191-.818-.319-1.322-.319-.438 0-.819.107-1.161.256l-1.024 1.744h2.701l.806-1.681z"/><path fill="#7C533E" d="M12.513 7.657c.687-.171 1.383.248 1.555.934l.284 1.14.756-2.155c.366-1.042 1.507-1.591 2.549-1.225l3.774 1.324c1.042.366 1.591 1.507 1.225 2.549l-2.648 7.549s-.331.944-1.275.613L13.072 16.4l-.613-1.275.345-.984-1.226-4.929c-.171-.688.248-1.385.935-1.555z"/><path fill="#583529" d="M18.743 12.054l1.655-4.718.944.331-1.655 4.718zm-2.83-.993l1.656-4.718.943.331-1.655 4.718z"/><path fill="#4289C1" d="M14.278 29.85s-1.719 3.579-2.107 4.416C11.484 35.75 10 36 10 36c-8 0-3.622-8.343-3.622-8.343l6.432-11.846 6.541 2.58-5.073 11.459z"/></svg>
\ No newline at end of file