about summary refs log tree commit diff
path: root/public/emoji/1f469-1f3fb-200d-1f373.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/1f469-1f3fb-200d-1f373.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/1f469-1f3fb-200d-1f373.svg')
-rw-r--r--public/emoji/1f469-1f3fb-200d-1f373.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3fb-200d-1f373.svg b/public/emoji/1f469-1f3fb-200d-1f373.svg
index 49513c95f..6ed4b51fc 100644
--- a/public/emoji/1f469-1f3fb-200d-1f373.svg
+++ b/public/emoji/1f469-1f3fb-200d-1f373.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(35,0)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g><g transform="translate(18,9)" id="g24"><path id="path26" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 8,0 4,-9 0,0 Z"/></g><g transform="translate(21.9453,30.9307)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.947,-2.053 10.947,-10.947 0,-8.896 0,-10.948 -2.052,-10.948 -2.053,0 -4.79,2.052 -8.895,2.052 -4.105,0 -6.785,-2.052 -8.895,-2.052 -2.288,0 -2.054,8.21 -2.054,10.948 C -10.949,-2.053 -4.105,0 0,0"/></g><g transform="translate(18.3281,8.9824)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-0.98 3.672,-0.98 0.708,0 2.194,-0.085 3.66,0.98 l 0,3.203 L 0,3.203 0,0 Z"/></g><g transform="translate(18.3223,10.8213)" id="g36"><path id="path38" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.022,-1.155 2.29,-1.468 3.668,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(13.7339,20.2822)" id="g40"><path id="path42" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.564 8.211,10.564 4.534,0 8.209,-4.73 8.209,-10.564 0,-5.833 -3.675,-10.285 -8.209,-10.285 C 3.676,-10.285 0,-5.833 0,0"/></g><g transform="translate(21.9453,12.457)" id="g44"><path id="path46" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.606,0 -2.447,0.794 -2.537,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.266,0.264 0.692,0.266 0.961,0.006 C -1.541,1.826 -1.025,1.367 0,1.367 1.038,1.367 1.555,1.84 1.576,1.859 1.85,2.115 2.279,2.107 2.539,1.84 2.799,1.571 2.799,1.148 2.535,0.885 2.445,0.794 1.605,0 0,0"/></g><g transform="translate(11.7251,17)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.021,1 -0.044,0.224 -0.044,0.465 0,3.422 2.053,-0.494 2.053,1.943 0,2.439 1.368,2.683 2.737,4.051 0.684,0.685 2.052,2.026 2.052,2.026 0,0 3.421,-2.067 6.158,-2.067 2.737,0 5.474,-1.375 5.474,-4.112 0,-2.737 2.053,1.584 2.053,-1.837 C 20.483,0.225 20.46,1 20.443,0 l 0.719,0 c 0.006,2 0.006,1.924 0.006,3.202 0,8.895 -6.842,10.729 -10.949,10.729 C 6.115,13.931 -0.728,12.152 -0.728,3.257 -0.728,2.464 -0.748,2 -0.72,0 L 0,0 Z"/></g><g transform="translate(18.6084,18.1133)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.466,0 0.847,-0.381 0.847,-0.846 l 0,-0.844 C 0.847,0.381 0.466,0 0,0"/></g><g transform="translate(25.373,18.1133)" id="g56"><path id="path58" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.847 l 0,0.844 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.844 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8359,15.5)" id="g60"><path id="path62" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.69,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.113,0.81 -1.924,1 -1.69,1 L 0,1 C 0.233,1 0.424,0.81 0.424,0.576 l 0,-0.153 C 0.424,0.189 0.233,0 0,0"/></g><g transform="translate(32.5,24)" id="g64"><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -3,-1 -10.5,-1 -18,-1 -21,0 -21,0 l 0,6 21,0 0,-6 z"/></g><g transform="translate(14,25)" id="g68"><path id="path70" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(31,25)" id="g72"><path id="path74" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(18,24.5)" id="g76"><path id="path78" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(22.5,24.25)" id="g80"><path id="path82" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(27,24.5)" id="g84"><path id="path86" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,3 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,3.5 0,3.276 0,3 L 0,0 Z"/></g><g transform="translate(28.25,36)" id="g88"><path id="path90" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.157,0 -2.237,-0.32 -3.167,-0.869 -4.097,-0.32 -5.177,0 -6.334,0 -7.456,0 -8.507,-0.3 -9.417,-0.818 -10.327,-0.3 -11.378,0 -12.5,0 c -3.452,0 -6.25,-2.798 -6.25,-6.25 0,-3.452 11.294,-3.25 12.416,-3.25 1.157,0 12.584,-0.202 12.584,3.25 C 6.25,-2.798 3.451,0 0,0"/></g><g transform="translate(10,11.25)" id="g92"><path id="path94" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-3.452 -2.015,-5.25 -4.5,-5.25 -6.985,-5.25 -9,-3.452 -9,0 -9,3.452 -6.985,7.25 -4.5,7.25 -2.015,7.25 0,3.452 0,0"/></g><path id="path96" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 6.5,0 -2,0 0,8 2,0 0,-8 z"/><g transform="translate(15.4443,20.0645)" id="g98"><path id="path100" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(31.833,20.0645)" id="g102"><path id="path104" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(14.8945,31.5112)" id="g106"><path id="path108" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.036,-0.008 0.071,-0.011 0.106,-0.011 0.231,0 0.438,0.16 0.488,0.394 0.032,0.145 0.335,1.441 1.32,2.212 0.76,0.596 1.748,0.987 2.007,1.084 C 3.524,3.904 3.097,4.08 2.653,4.214 2.23,4.005 1.739,3.728 1.297,3.382 0.062,2.415 -0.319,0.89 -0.383,0.594 -0.441,0.324 -0.27,0.058 0,0"/></g><g transform="translate(27.0508,34.0972)" id="g110"><path id="path112" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.986,-0.772 1.289,-2.066 1.319,-2.212 0.051,-0.234 0.258,-0.394 0.49,-0.394 0.034,0 0.069,0.003 0.105,0.011 0.27,0.058 0.441,0.324 0.384,0.594 C 2.233,-1.706 1.855,-0.182 0.617,0.787 0.191,1.12 -0.279,1.389 -0.691,1.596 -1.125,1.456 -1.542,1.279 -1.929,1.054 -1.593,0.923 -0.703,0.55 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M35 36v-3.5c0-3.314-3.685-5.5-7-5.5H16c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#269" d="M18 27h8l-4 9-4-9"/><path fill="#292F33" d="M21.945 5.069c4.105 0 10.947 2.053 10.947 10.947 0 8.896 0 10.948-2.053 10.948s-4.79-2.053-8.895-2.053c-4.105 0-6.785 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.001-8.894 6.844-10.947 10.949-10.947"/><path fill="#F7DECE" d="M18.328 27.018c1.466 1.065 2.964.98 3.672.98s2.194.085 3.66-.98v-3.203h-7.332v3.203z"/><path fill="#EEC2AD" d="M18.322 25.179c1.022 1.155 2.29 1.468 3.668 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.338v2.936z"/><path fill="#F7DECE" d="M13.734 15.718c0-5.834 3.676-10.563 8.211-10.563 4.533 0 8.209 4.729 8.209 10.563 0 5.833-3.676 10.285-8.209 10.285-4.535 0-8.211-4.452-8.211-10.285"/><path fill="#DF1F32" d="M21.945 23.543c-1.606 0-2.447-.794-2.537-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.961-.007.035.032.551.491 1.576.491 1.038 0 1.555-.473 1.576-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.535.885"/><path fill="#292F33" d="M11.725 19c-.021-1-.044-.224-.044-.465 0-3.422 2.053.494 2.053-1.943 0-2.439 1.368-2.683 2.736-4.051.685-.685 2.053-2.026 2.053-2.026s3.421 2.067 6.158 2.067c2.736 0 5.474 1.375 5.474 4.112 0 2.736 2.053-1.584 2.053 1.837 0 .244-.022-.531-.04.469h.719c.006-2 .006-1.924.006-3.202 0-8.895-6.842-10.729-10.948-10.729-4.104 0-10.947 1.778-10.947 10.674 0 .793-.02 1.257.008 3.257h.719z"/><path fill="#662113" d="M18.608 17.887c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.466 0 .847.381.847.846v.845c0 .466-.381.847-.847.847m6.765 0c-.465 0-.846-.381-.846-.847v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .466-.381.847-.846.847"/><path fill="#C1694F" d="M22.836 20.5h-1.69c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.69c.233 0 .424.19.424.424v.153c0 .233-.191.423-.424.423"/><path fill="#CCD6DD" d="M32.5 12s-3 1-10.5 1-10.5-1-10.5-1V6h21v6z"/><path fill="#99AAB5" d="M14 11c0 .276-.224.5-.5.5s-.5-.224-.5-.5V8c0-.276.224-.5.5-.5s.5.224.5.5v3zm17 0c0 .276-.224.5-.5.5s-.5-.224-.5-.5V8c0-.276.224-.5.5-.5s.5.224.5.5v3zm-13 .5c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm4.5.25c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3zm4.5-.25c0 .276-.224.5-.5.5s-.5-.224-.5-.5v-3c0-.276.224-.5.5-.5s.5.224.5.5v3z"/><path fill="#E1E8ED" d="M28.25 0c-1.157 0-2.237.32-3.167.869C24.153.32 23.073 0 21.916 0c-1.122 0-2.173.3-3.083.818C17.923.3 16.872 0 15.75 0 12.298 0 9.5 2.798 9.5 6.25S20.794 9.5 21.916 9.5c1.157 0 12.584.202 12.584-3.25S31.701 0 28.25 0z"/><path fill="#C1694F" d="M10 24.75C10 28.202 7.985 30 5.5 30S1 28.202 1 24.75s2.015-7.25 4.5-7.25 4.5 3.798 4.5 7.25z"/><path fill="#C1694F" d="M4.5 28h2v8h-2z"/><path d="M15.444 15.936c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623m16.389 0c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623" fill="#F7DECE"/><path fill="#CCD6DD" d="M14.894 4.489c.036.008.071.011.106.011.231 0 .438-.16.488-.394.031-.145.334-1.441 1.319-2.212.76-.595 1.749-.987 2.007-1.084-.396-.225-.824-.4-1.268-.535-.423.21-.914.486-1.355.832-1.236.967-1.617 2.492-1.681 2.788-.057.27.115.536.384.594zm12.157-2.586c.986.772 1.289 2.066 1.319 2.211.051.235.258.395.489.395.034 0 .069-.003.105-.011.27-.058.441-.324.384-.594-.064-.296-.443-1.82-1.681-2.789-.426-.333-.896-.602-1.309-.809-.434.139-.851.317-1.237.542.337.132 1.227.504 1.93 1.055z"/></svg>
\ No newline at end of file