diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f469-1f3ff-200d-2696-fe0f.svg | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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-1f3ff-200d-2696-fe0f.svg')
-rw-r--r-- | public/emoji/1f469-1f3ff-200d-2696-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3ff-200d-2696-fe0f.svg b/public/emoji/1f469-1f3ff-200d-2696-fe0f.svg index 2385f231a..4fe0541fc 100644 --- a/public/emoji/1f469-1f3ff-200d-2696-fe0f.svg +++ b/public/emoji/1f469-1f3ff-200d-2696-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,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(35,0)" id="g20"><path id="path22" style="fill:#292f33;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.3281,8.9805)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-1.98 3.672,-1.98 0.708,0 2.194,0.915 3.66,1.98 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(18.3213,10.8213)" id="g28"><path id="path30" style="fill:#664131;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(18.8691,30.6631)" id="g32"><path id="path34" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.433 1.434,2.594 3.202,2.594 4.971,2.594 6.404,1.433 6.404,0 6.404,-1.433 4.971,-2.594 3.202,-2.594 1.434,-2.594 0,-1.433 0,0"/></g><g transform="translate(31.7988,19.6382)" id="g36"><path id="path38" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.388 -0.683,2.511 -1.539,2.581 -0.89,4.841 -4.213,8.444 -8.188,8.444 -3.976,0 -7.3,-3.603 -8.188,-8.444 -0.858,-0.07 -1.54,-1.193 -1.54,-2.581 0,-1.396 0.691,-2.527 1.555,-2.583 0.913,-4.516 4.22,-7.145 8.173,-7.145 3.952,0 7.258,2.629 8.172,7.145 C -0.691,-2.527 0,-1.396 0,0"/></g><g transform="translate(22.0713,12.7305)" id="g40"><path id="path42" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.634,0 -2.266,0.488 -2.376,0.586 -2.644,0.824 -2.668,1.234 -2.43,1.502 -2.2,1.763 -1.806,1.793 -1.538,1.575 -1.499,1.55 -1.084,1.297 0,1.297 1.136,1.297 1.537,1.574 1.541,1.578 1.81,1.816 2.206,1.779 2.443,1.512 2.682,1.244 2.645,0.824 2.376,0.586 2.267,0.488 1.633,0 0,0"/></g><g transform="translate(22.7197,15)" id="g44"><path id="path46" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.297,0 c -0.357,0 -0.648,0.142 -0.648,0.5 0,0.358 0.291,0.5 0.648,0.5 L 0,1 C 0.358,1 0.649,0.858 0.649,0.5 0.649,0.142 0.358,0 0,0"/></g><g transform="translate(31.7988,25.4751)" id="g48"><path id="path50" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.297,4.54 -5.187,5.837 -7.255,5.837 -1.176,0 -2.472,-0.649 -2.472,-0.649 0,0 -1.297,0.649 -2.594,0.649 -1.946,0 -5.837,-1.297 -7.134,-5.837 -1.069,-3.741 1.297,-7.134 1.297,-7.134 0,1.946 1.297,5.837 4.539,5.837 3.243,0 3.892,2.594 3.892,2.594 0,0 0.509,-2.594 3.752,-2.594 3.243,0 4.678,-3.891 4.678,-5.837 0,0 2.366,3.393 1.297,7.134"/></g><g transform="translate(31.7988,17.6924)" id="g52"><path id="path54" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.357 -0.29,-0.648 -0.648,-0.648 -0.359,0 -0.649,0.291 -0.649,0.648 0,0.358 0.29,0.649 0.649,0.649 C -0.29,0.649 0,0.358 0,0"/></g><g transform="translate(13.6406,17.6924)" id="g56"><path id="path58" style="fill:#aa8dd8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.358 -0.29,0.649 -0.649,0.649 -0.358,0 -0.648,-0.291 -0.648,-0.649 0,-0.357 0.29,-0.648 0.648,-0.648 C -0.29,-0.648 0,-0.357 0,0"/></g><g transform="translate(19.5,21)" id="g60"><path id="path62" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.275,0 -2.5,0.225 -2.5,0.5 -2.5,0.775 -2.275,1 -2,1 L 0,1 C 0.275,1 0.5,0.775 0.5,0.5 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(26.5,21)" id="g64"><path id="path66" style="fill:#808285;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2,0 C -2.275,0 -2.5,0.225 -2.5,0.5 -2.5,0.775 -2.275,1 -2,1 L 0,1 C 0.275,1 0.5,0.775 0.5,0.5 0.5,0.225 0.275,0 0,0"/></g><g transform="translate(18.5,17.75)" id="g68"><path id="path70" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.413,0 -0.75,0.337 -0.75,0.75 l 0,1 c 0,0.413 0.337,0.75 0.75,0.75 0.413,0 0.75,-0.337 0.75,-0.75 l 0,-1 C 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(25.5,17.75)" id="g72"><path id="path74" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.413,0 -0.75,0.337 -0.75,0.75 l 0,1 c 0,0.413 0.337,0.75 0.75,0.75 0.413,0 0.75,-0.337 0.75,-0.75 l 0,-1 C 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(18,10)" id="g76"><path id="path78" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.548,-0.379 4,-3 4,-3 0,0 -3.333,-3.333 -4,-3 -0.667,0.333 -1.083,4.333 -1,5 0.083,0.667 0.458,1.375 1,1"/></g><g transform="translate(25.9893,10)" id="g80"><path id="path82" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.548,-0.379 -4,-3 -4,-3 0,0 3.333,-3.333 4,-3 0.667,0.333 1.083,4.333 1,5 -0.083,0.667 -0.458,1.375 -1,1"/></g><g transform="translate(12.083,2.6592)" id="g84"><path id="path86" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(15.083,2.6592)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.251,0 0.401,-2.659 0.401,-2.659 l -0.956,0 C -0.555,-2.659 -0.362,0 0,0"/></g><g transform="translate(31.9287,2.6592)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.361,0 0,0"/></g><g transform="translate(28.9287,2.6592)" id="g96"><path id="path98" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.251,0 -0.401,-2.659 -0.401,-2.659 l 0.956,0 C 0.555,-2.659 0.361,0 0,0"/></g><g transform="translate(7.3818,0)" id="g100"><path id="path102" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.71,0 -3.667,9.707 c -0.155,0.412 -0.619,0.621 -1.031,0.466 -0.411,-0.156 -0.621,-0.62 -0.465,-1.031 L 0,0 Z"/></g><g transform="translate(7.8535,12.335)" id="g104"><path id="path106" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.468,-1.24 0.178,-2.498 -0.649,-2.812 -1.475,-3.123 -2.525,-2.371 -2.994,-1.131 -3.462,0.108 -3.172,1.367 -2.345,1.68 -1.518,1.992 -0.468,1.24 0,0"/></g><g transform="translate(5.8633,9.3027)" id="g108"><path id="path110" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.996,-0.754 c -1.097,-0.415 -2.335,0.144 -2.749,1.241 -0.415,1.099 0.144,2.336 1.242,2.749 l 1.995,0.755 C -0.41,4.406 0.827,3.847 1.242,2.75 1.656,1.651 1.098,0.415 0,0"/></g><g transform="translate(3.3633,10.6387)" id="g112"><path id="path114" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.468,-1.24 0.178,-2.498 -0.649,-2.812 -1.475,-3.123 -2.525,-2.371 -2.994,-1.131 -3.462,0.108 -3.172,1.367 -2.345,1.68 -1.518,1.992 -0.468,1.24 0,0"/></g><g transform="translate(11.3179,0)" id="g116"><path id="path118" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.466,1.588 C -0.829,2.827 -2.139,3.543 -3.377,3.18 L -4.632,2.812 C -5.837,2.458 -6.539,1.208 -6.242,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" 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="#7C533E" d="M18.328 27.02C19.794 28.085 21.292 29 22 29s2.194-.915 3.66-1.98v-3.205h-7.332v3.205z"/><path fill="#664131" 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="#6D6E71" d="M18.869 5.337c0-1.433 1.434-2.594 3.202-2.594s3.202 1.161 3.202 2.594-1.434 2.594-3.202 2.594-3.202-1.161-3.202-2.594"/><path fill="#7C533E" d="M31.799 16.362c0-1.388-.683-2.511-1.539-2.581-.89-4.841-4.213-8.444-8.188-8.444s-7.299 3.603-8.188 8.444c-.857.07-1.539 1.193-1.539 2.581 0 1.396.691 2.527 1.555 2.583.913 4.516 4.22 7.145 8.172 7.145 3.952 0 7.259-2.629 8.173-7.145.862-.056 1.554-1.187 1.554-2.583"/><path fill="#DF1F32" d="M22.071 23.27c-1.634 0-2.266-.488-2.376-.586-.268-.238-.292-.648-.054-.916.229-.261.624-.291.892-.073.039.025.454.278 1.538.278 1.136 0 1.537-.277 1.541-.281.269-.238.665-.201.902.066.238.268.201.688-.067.926-.109.097-.743.586-2.376.586"/><path fill="#3D2E24" d="M22.72 21h-1.297c-.358 0-.648-.142-.648-.5s.291-.5.648-.5h1.297c.358 0 .649.142.649.5s-.291.5-.649.5"/><path fill="#808285" d="M31.799 10.525c-1.297-4.54-5.188-5.837-7.255-5.837-1.176 0-2.473.649-2.473.649s-1.297-.649-2.594-.649c-1.945 0-5.836 1.297-7.133 5.837-1.069 3.741 1.297 7.134 1.297 7.134 0-1.946 1.297-5.837 4.539-5.837 3.243 0 3.892-2.594 3.892-2.594s.51 2.594 3.753 2.594c3.242 0 4.678 3.891 4.678 5.837-.001 0 2.365-3.393 1.296-7.134"/><circle fill="#AA8DD8" cx="31.15" cy="18.307" r=".649"/><circle fill="#AA8DD8" cx="12.992" cy="18.307" r=".649"/><path fill="#808285" d="M19.5 15h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5m7 0h-2c-.275 0-.5-.225-.5-.5s.225-.5.5-.5h2c.275 0 .5.225.5.5s-.225.5-.5.5"/><path d="M18.5 18.25c-.413 0-.75-.337-.75-.75v-1c0-.413.337-.75.75-.75s.75.337.75.75v1c0 .413-.337.75-.75.75m7 0c-.413 0-.75-.337-.75-.75v-1c0-.413.337-.75.75-.75s.75.337.75.75v1c0 .413-.337.75-.75.75"/><path fill="#F5F8FA" d="M26.989 27c-.083-.667-.458-1.375-1-1-.543.376-3.936 2.952-3.995 2.996-.058-.044-3.451-2.62-3.994-2.996-.542-.375-.917.333-1 1s.333 4.667 1 5c.661.33 3.937-2.937 3.995-2.995.058.058 3.334 3.325 3.995 2.995.666-.333 1.082-4.333.999-5z"/><path fill="#66757F" d="M12.083 33.341c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m3 0c.251 0 .401 2.659.401 2.659h-.956s.193-2.659.555-2.659m16.846 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659m-3 0c-.251 0-.401 2.659-.401 2.659h.956c-.001 0-.194-2.659-.555-2.659"/><path fill="#C1694F" d="M7.854 23.665c.468 1.24.178 2.498-.649 2.812-.826.311-1.876-.441-2.345-1.681-.468-1.239-.178-2.498.649-2.811.826-.312 1.876.44 2.345 1.68"/><path fill="#662113" d="M9.092 36l-3.479-9.208.25-.094c1.098-.415 1.656-1.651 1.242-2.75-.415-1.097-1.652-1.656-2.75-1.241l-1.995.754c-1.098.413-1.657 1.65-1.242 2.749.414 1.098 1.652 1.656 2.749 1.241l.25-.094L7.382 36h1.71z"/><path fill="#C1694F" d="M3.363 25.361c.468 1.24.178 2.498-.649 2.812-.826.312-1.876-.44-2.345-1.681-.468-1.239-.178-2.498.649-2.811.827-.312 1.877.44 2.345 1.68"/><path fill="#7C533E" d="M11.318 36l-.466-1.588c-.363-1.239-1.673-1.955-2.911-1.592l-1.255.368c-1.205.354-1.907 1.604-1.61 2.812h6.242z"/></svg> \ No newline at end of file |