about summary refs log tree commit diff
path: root/public/emoji/1f469-1f3fc-200d-1f680.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-1f3fc-200d-1f680.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-1f3fc-200d-1f680.svg')
-rw-r--r--public/emoji/1f469-1f3fc-200d-1f680.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3fc-200d-1f680.svg b/public/emoji/1f469-1f3fc-200d-1f680.svg
index 11378acae..39635e275 100644
--- a/public/emoji/1f469-1f3fc-200d-1f680.svg
+++ b/public/emoji/1f469-1f3fc-200d-1f680.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,0 36,0 36,36 0,36 0,0 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.2119,8.9297)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.505 -3.676,-2.726 -8.212,-2.726 -4.535,0 -8.212,1.221 -8.212,2.726 0,1.505 3.677,2.727 8.212,2.727 C -3.676,2.727 0,1.505 0,0"/></g><g transform="translate(35,0)" id="g24"><path id="path26" 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(30.9336,9)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.306,0 -0.858,0 c 0.014,0 0.029,-0.065 0.029,-0.127 0,-1.36 -3.491,-2.434 -7.799,-2.434 -4.307,0 -7.798,1.06 -7.798,2.42 0,0.062 0.015,0.141 0.029,0.141 l -0.734,0 -0.705,-0.099 0.005,-1.018 c 0.114,-2.405 4.186,-3.392 9.203,-3.392 4.998,0 9.054,1.009 9.2,3.413 L 0.28,-0.122 0,0 Z"/></g><g transform="translate(22,6.4668)" id="g32"><path id="path34" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.307,0 -7.799,1.104 -7.799,2.464 0,1.359 3.492,2.463 7.799,2.463 4.307,0 7.799,-1.104 7.799,-2.463 C 7.799,1.104 4.307,0 0,0 m 0,5.901 c -5.089,0 -9.214,-1.539 -9.214,-3.437 0,-1.9 4.125,-3.44 9.214,-3.44 5.089,0 9.214,1.54 9.214,3.44 0,1.898 -4.125,3.437 -9.214,3.437"/></g><g transform="translate(29.7773,8.7959)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.589,0.132 -1.189,0.204 -1.777,0.204 l -12,0 c -0.589,0 -1.188,-0.072 -1.778,-0.204 0.222,-1.297 3.614,-2.329 7.778,-2.329 4.164,0 7.555,1.032 7.777,2.329"/></g><g transform="translate(21.9443,30.9312)" id="g40"><path id="path42" style="fill:#ffe51e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4.105,0 10.948,-2.053 10.948,-10.948 0,-8.895 0,-10.948 -2.053,-10.948 -2.053,0 -4.152,2.053 -8.895,2.053 -4.105,0 -6.784,-2.053 -8.895,-2.053 -2.287,0 -2.053,8.211 -2.053,10.948 C -10.948,-2.053 -4.105,0 0,0"/></g><g transform="translate(18.3281,8.9805)" id="g44"><path id="path46" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-1.207 3.672,-1.207 0.708,0 2.194,0.142 3.66,1.207 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(18.3213,10.8213)" id="g48"><path id="path50" style="fill:#e2c196;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.023,-1.155 2.291,-1.468 3.669,-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.2827)" id="g52"><path id="path54" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.563 8.21,10.563 4.535,0 8.211,-4.729 8.211,-10.563 0,-5.833 -3.676,-10.286 -8.211,-10.286 C 3.676,-10.286 0,-5.833 0,0"/></g><g transform="translate(21.9443,12.457)" id="g56"><path id="path58" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.605,0 -2.446,0.794 -2.536,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.265,0.264 0.692,0.266 0.96,0.006 C -1.541,1.826 -1.023,1.367 0,1.367 1.039,1.367 1.557,1.84 1.577,1.859 1.851,2.115 2.28,2.107 2.54,1.84 2.8,1.571 2.8,1.148 2.536,0.885 2.446,0.794 1.606,0 0,0"/></g><g transform="translate(11.7251,17)" id="g60"><path id="path62" style="fill:#ffe51e;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.736,4.051 0.685,0.685 2.053,2.026 2.053,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.718,0 c 0.007,2 0.007,1.924 0.007,3.202 0,8.895 -6.843,12.207 -10.949,12.207 C 6.114,15.409 -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.1138)" id="g64"><path id="path66" 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.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.847,-0.381 0.847,-0.846 l 0,-0.845 C 0.847,0.381 0.465,0 0,0"/></g><g transform="translate(25.373,18.1138)" id="g68"><path id="path70" 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.846 l 0,0.845 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.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(22.8369,15.5)" id="g72"><path id="path74" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.925,1 -1.691,1 L 0,1 C 0.232,1 0.423,0.81 0.423,0.576 l 0,-0.153 C 0.423,0.189 0.232,0 0,0"/></g><path id="path76" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 32,3 3,0 0,-3 -3,0 0,3 z"/><path id="path78" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 35,0 -2,0 0,2 2,0 0,-2 z"/><g transform="translate(24.0039,0)" id="g80"><path id="path82" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.198,5.146 -6.048,9 -11.857,9 -17.666,9 -22.515,5.146 -23.713,0 L 0,0 Z"/></g><g transform="translate(22.6689,0)" id="g84"><path id="path86" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.173,4.464 -5.432,7.778 -10.522,7.778 -15.611,7.778 -19.871,4.464 -21.044,0 L 0,0 Z"/></g><g transform="translate(21.6377,0)" id="g88"><path id="path90" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.148,3.937 -4.956,6.833 -9.49,6.833 -4.534,0 -8.343,-2.896 -9.491,-6.833 L 0,0 Z"/></g><g transform="translate(18.1953,0.9512)" id="g92"><path id="path94" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.103,0.063 C 0.87,0.53 1.03,1.602 0.402,2.245 -0.064,2.726 -0.59,3.154 -1.164,3.513 -1.724,3.862 -2.321,4.134 -2.947,4.34 -3.775,4.612 -4.658,4.107 -4.813,3.248 -4.933,2.588 -4.588,1.902 -3.958,1.671 -3.093,1.353 -2.331,0.844 -1.727,0.197 -1.284,-0.275 -0.553,-0.336 0,0"/></g><g transform="translate(6.3442,21.7378)" id="g96"><path id="path98" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.542,0.571 -0.6,2.2 c -0.079,0.29 -0.343,0.491 -0.644,0.491 -0.3,0 -0.564,-0.201 -0.643,-0.491 l -0.6,-2.2 L -5.571,0 c -0.262,-0.096 -0.435,-0.346 -0.435,-0.625 0,-0.279 0.173,-0.529 0.435,-0.625 l 1.534,-0.568 0.605,-2.415 c 0.074,-0.296 0.341,-0.505 0.646,-0.505 0.306,0 0.573,0.209 0.647,0.505 L -1.534,-1.818 0,-1.25 c 0.262,0.096 0.435,0.346 0.435,0.625 C 0.435,-0.346 0.262,-0.096 0,0"/></g><g transform="translate(11.2798,31.3662)" id="g100"><path id="path102" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.61,0.966 -0.966,2.61 c -0.16,0.433 -0.573,0.72 -1.035,0.72 -0.461,0 -0.874,-0.287 -1.035,-0.72 L -6.612,0.966 -9.221,0 c -0.434,-0.161 -0.721,-0.573 -0.721,-1.035 0,-0.462 0.287,-0.874 0.721,-1.035 l 2.609,-0.966 0.966,-2.61 c 0.161,-0.433 0.574,-0.72 1.035,-0.72 0.462,0 0.875,0.287 1.035,0.72 L -2.61,-3.036 0,-2.07 c 0.433,0.161 0.72,0.573 0.72,1.035 C 0.72,-0.573 0.433,-0.161 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-2.486-2.073-4.337-4.508-5.107-.409-.129-17.117.044-17.117.044C10.998 28.232 9 30.06 9 32.5V36h26z"/><path fill="#EA596E" d="M29.799 27.127c0 1.36-3.491 2.434-7.799 2.434s-7.798-1.06-7.798-2.42c0-.062-1.41-.042-1.41-.042l.005 1.019c.114 2.405 4.186 3.392 9.204 3.392 4.997 0 9.054-1.009 9.199-3.413l.015-.974c-.001-.001-1.416-.058-1.416.004z"/><path fill="#BE1931" d="M22 23.632c-5.089 0-9.214 1.539-9.214 3.438 0 1.899 4.125 3.439 9.214 3.439s9.214-1.54 9.214-3.439-4.125-3.438-9.214-3.438"/><path fill="#292F33" d="M22 29.533c-4.307 0-7.799-1.104-7.799-2.464 0-1.359 3.492-2.463 7.799-2.463s7.799 1.104 7.799 2.463c0 1.361-3.492 2.464-7.799 2.464"/><path fill="#FFE51E" d="M21.944 5.069c4.106 0 10.948 2.053 10.948 10.948s0 10.948-2.053 10.948c-2.054 0-4.152-2.053-8.896-2.053-4.105 0-6.784 2.053-8.895 2.053-2.287 0-2.053-8.211-2.053-10.948.002-8.895 6.844-10.948 10.949-10.948"/><path fill="#F3D2A2" d="M18.328 27.02c1.466 1.065 2.964 1.207 3.672 1.207s2.194-.142 3.66-1.207v-3.205h-7.332v3.205z"/><path fill="#E2C196" d="M18.321 25.179c1.023 1.155 2.291 1.468 3.669 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.339v2.936z"/><path fill="#F3D2A2" d="M13.734 15.717c0-5.834 3.676-10.563 8.21-10.563 4.534 0 8.211 4.729 8.211 10.563 0 5.833-3.677 10.286-8.211 10.286-4.534 0-8.21-4.452-8.21-10.286"/><path fill="#DF1F32" d="M21.944 23.543c-1.605 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.96-.007.035.032.553.491 1.576.491 1.039 0 1.557-.473 1.577-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.536.885"/><path fill="#FFE51E" 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.112s2.053-1.584 2.053 1.837c0 .244-.022-.531-.04.469h.718c.007-2 .007-1.924.007-3.202 0-8.895-6.843-12.207-10.948-12.207S10.998 6.848 10.998 15.743c0 .793-.02 1.257.008 3.257h.719z"/><path fill="#60352A" d="M18.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846s.847.381.847.846v.845c0 .465-.382.846-.847.846m6.765 0c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .465-.381.846-.846.846"/><path fill="#C1694F" d="M22.837 20.5h-1.691c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><path fill="#55ACEE" d="M32 33h3v3h-3z"/><path fill="#FFCC4D" d="M33 34h2v2h-2z"/><path fill="#E1E8ED" d="M24.004 36c-1.198-5.146-6.048-9-11.857-9C6.338 27 1.489 30.854.291 36h23.713z"/><path fill="#292F33" d="M22.669 36c-1.173-4.464-5.432-7.778-10.522-7.778-5.089 0-9.349 3.314-10.522 7.778h21.044z"/><path fill="#FFAC33" d="M21.638 36c-1.148-3.937-4.956-6.833-9.49-6.833S3.805 32.063 2.657 36h18.981z"/><path fill="#FFDC5D" d="M18.195 35.049l.103-.063c.767-.467.928-1.538.3-2.182-.467-.48-.993-.909-1.566-1.268-.56-.35-1.158-.621-1.784-.827-.828-.272-1.711.232-1.866 1.092-.119.66.225 1.346.855 1.577.865.318 1.627.827 2.232 1.474.442.472 1.173.533 1.726.197"/><path fill="#9266CC" d="M6.344 14.262l-1.542-.571-.6-2.2c-.079-.29-.343-.491-.644-.491-.3 0-.564.201-.643.491l-.6 2.2-1.542.571c-.262.096-.435.346-.435.625s.173.529.435.625l1.534.568.605 2.414c.074.297.341.506.646.506.306 0 .573-.209.647-.505l.605-2.414 1.534-.568c.262-.096.435-.346.435-.625 0-.28-.173-.53-.435-.626"/><path fill="#5DADEC" d="M11.28 4.634l-2.61-.966-.966-2.61c-.16-.433-.573-.72-1.035-.72-.461 0-.874.287-1.035.72l-.966 2.61-2.609.966c-.434.161-.722.573-.722 1.035 0 .462.287.874.721 1.035l2.609.966.966 2.61c.161.433.575.72 1.035.72.462 0 .875-.287 1.035-.72l.966-2.61 2.61-.966c.433-.161.721-.573.721-1.035 0-.462-.288-.874-.72-1.035"/></svg>
\ No newline at end of file