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/1f93a.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/1f93a.svg')
-rw-r--r-- | public/emoji/1f93a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f93a.svg b/public/emoji/1f93a.svg index 663bae152..5cfb388e8 100644 --- a/public/emoji/1f93a.svg +++ b/public/emoji/1f93a.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(24.2188,28.5)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.781,0 -2.438,-1.344 -2.563,-1.687 -2.688,-2.031 -3.906,-4.094 -4,-4.562 c -0.094,-0.469 -0.562,-0.25 -0.969,-0.188 -0.406,0.063 -2.375,0.156 -3.094,0.188 0,0 -0.485,0.743 -1.156,0.687 -0.75,-0.063 -1.281,-0.281 -1.406,-1.031 -0.125,-0.75 1.031,-1.563 1.562,-1.563 0.532,0 1,0.282 1.188,0.282 0.188,0 3.094,-0.657 3.625,-0.719 0.531,-0.063 1.469,-0.031 1.719,0.375 0.25,0.406 2.094,2.906 2.344,3.406 C 0.062,-2.625 0,0 0,0"/></g><g transform="translate(22.6875,19.9063)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.503,-7.748 -3.792,-8.184 -0.289,-0.435 -0.334,-1.232 -0.208,-1.91 0.126,-0.677 2.003,-6.485 1.847,-7.673 -0.076,-0.576 2.588,-1.38 2.088,-0.039 -0.469,1.258 -0.35,3.709 -0.497,5.681 -0.105,1.396 -0.5,2.812 -0.5,2.812 L 2.5,-3.75 c 0,0 1.917,-4.909 2,-5.781 0.031,-0.323 -0.208,-1.214 -0.188,-2.344 0.035,-1.922 0.31,-4.416 0.25,-5.125 -0.089,-1.075 1.597,-1.829 1.712,-0.071 0.125,1.91 1.353,5.643 0.976,8.133 -0.637,4.206 -1.5,8.469 -1.5,8.469 L 0,0 Z"/></g><g transform="translate(31.1069,0.9751)" id="g28"><path id="path30" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.08,0 c -0.581,0 -0.166,1.287 -0.124,1.827 0.041,0.54 0.291,0.249 0.498,0.083 0.208,-0.166 0.716,0.042 1.173,0.291 0.457,0.249 1.074,0.466 1.27,0.168 C -0.544,1.275 0.087,1.468 0.612,1.056 1.049,0.712 1.268,0 0,0"/></g><g transform="translate(18.6875,0.9751)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.848,0 C 4.43,0 4.014,1.287 3.973,1.827 3.931,2.367 3.682,2.076 3.474,1.91 3.267,1.744 1.917,1.536 1.781,2.181 1.674,2.69 0.823,2.447 0.625,2.15 0,1.214 -1.593,1.585 -2,1.056 -2.358,0.591 -2.425,0 0,0"/></g><g transform="translate(25.25,28.5313)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.75,0 C 3.719,0 4.25,-0.719 4.375,-1.25 4.5,-1.781 4.531,-3.094 4.062,-3.875 3.594,-4.656 2.706,-6.344 2.706,-7.219 c 0,-0.875 0.95,-2.937 1.075,-3.5 0.125,-0.562 -0.985,-0.458 -1.781,-1 -0.781,-0.531 -1.594,-1.437 -1.656,-1.719 -0.063,-0.281 -1.031,-0.656 -1.219,-0.062 -0.187,0.594 -0.833,1.35 -1.688,2.062 -0.562,0.469 -1.031,0.625 -1,0.938 0.032,0.312 0.65,1.887 0.703,2.43 0.25,2.532 -1.248,2.597 -0.828,4.32 0.248,1.015 1.125,3.156 1.876,3.531 C -1.062,0.156 -0.812,0 0,0"/></g><g transform="translate(28.875,28.2813)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.906,0.062 1.187,-0.406 1.594,-0.594 0.406,-0.187 1.5,-0.593 1.75,-0.687 0.25,-0.094 0.687,-0.625 0.687,0.219 0,0.438 0.219,1.531 0.313,2.031 0.133,0.709 0.25,1.375 0.25,1.375 0,0 -0.719,1.031 -0.688,1.344 C 3.938,4 4.281,4.812 4.687,5 5.094,5.187 6.25,4.531 6.625,4.281 7,4.031 6.844,3.406 6.562,3 6.281,2.594 6.001,1.885 6.001,1.226 6.001,0.382 6.02,-2.039 5.801,-3.695 5.727,-4.256 4.957,-4.257 4.395,-4.195 3.832,-4.132 1.344,-3.719 -0.187,-3.375 -1.719,-3.031 -0.906,-0.062 0,0"/></g><g transform="translate(24.8505,34.6425)" id="g44"><path id="path46" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.404,0.299 2.624,-0.453 3.105,-1.26 3.931,-2.643 2.773,-4.718 3.243,-5.58 3.679,-6.38 3.369,-6.566 2.743,-6.986 2.131,-7.398 1.48,-7.918 0.212,-7.893 c -1.465,0.03 -1.676,0.86 -1.5,1.563 0.086,0.342 0.087,0.676 0.028,0.999 0,0 -0.585,0.468 -0.615,2.021 C -1.897,-2.109 -2.197,-0.469 0,0"/></g><g transform="translate(27.7501,31.7916)" id="g48"><path id="path50" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.18,-1.623 -1.391,-3.51 -2.719,-3.51 -1.328,0 -2.198,1.311 -2.348,2.904 -0.15,1.587 1.466,3.592 2.848,3.502 C -0.894,2.81 0.176,1.584 0,0"/></g><g transform="translate(27.34,31.8502)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.18,-1.623 -1.168,-3.256 -2.496,-3.256 -1.328,0 -2.366,1.332 -2.22,3.236 0.138,1.796 1.212,2.979 2.595,2.889 C -0.796,2.782 0.176,1.584 0,0"/></g><g transform="translate(14.0892,24.2576)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.222,0.047 -0.44,0.093 -0.664,0.14 -7.96,1.662 -13.921,2.67 -13.979,2.391 -14.037,2.112 -8.17,0.652 -0.875,-0.87 -0.65,-0.916 -0.432,-0.961 -0.21,-1.007 L 0,0 Z"/></g><g transform="translate(15.2078,23.4989)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.183,-0.878 -0.784,-1.497 -1.341,-1.38 -0.558,0.116 -1.106,0.974 -0.923,1.852 0.184,0.879 1.029,1.446 1.586,1.329 C -0.12,1.685 0.183,0.879 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M24.219 7.5c-1.781 0-2.438 1.344-2.562 1.688-.125.344-1.344 2.406-1.438 2.875-.094.469-.562.25-.969.188-.406-.062-2.375-.156-3.094-.188 0 0-.485-.743-1.156-.688-.75.062-1.281.281-1.406 1.031s1.031 1.562 1.562 1.562c.531 0 1-.281 1.188-.281s3.094.656 3.625.719c.531.062 1.469.031 1.719-.375s2.094-2.906 2.344-3.406.187-3.125.187-3.125zm-1.531 8.594s-3.503 7.748-3.792 8.184c-.289.435-.334 1.233-.208 1.91s2.003 6.486 1.847 7.673c-.076.576 2.588 1.38 2.087.039-.469-1.258-.349-3.708-.497-5.681-.105-1.396-.5-2.813-.5-2.813l3.562-5.562s1.917 4.909 2 5.781c.031.323-.208 1.214-.188 2.344.034 1.922.309 4.416.25 5.125-.09 1.075 1.597 1.829 1.712.071.125-1.91 1.353-5.644.976-8.134-.637-4.205-1.5-8.469-1.5-8.469l-5.749-.468z"/><path fill="#99AAB5" d="M31.107 35.025h-4.08c-.582 0-.166-1.287-.125-1.827.042-.54.291-.249.498-.083.208.166.716-.042 1.173-.291.457-.249 1.074-.466 1.27-.168.719 1.094 1.35.9 1.875 1.312.438.344.657 1.057-.611 1.057zm-12.419 0h3.848c.581 0 .166-1.287.125-1.827-.042-.54-.291-.249-.498-.083-.208.166-1.557.374-1.693-.271-.107-.509-.958-.266-1.156.031-.625.936-2.218.565-2.625 1.094-.359.465-.426 1.056 1.999 1.056zM25.25 7.469H28c.969 0 1.5.719 1.625 1.25s.156 1.844-.312 2.625c-.469.781-1.356 2.469-1.356 3.344s.95 2.937 1.075 3.5-.985.459-1.781 1c-.781.531-1.594 1.438-1.656 1.719-.062.281-1.031.656-1.219.062-.188-.594-.833-1.35-1.688-2.062-.562-.469-1.031-.625-1-.938.031-.312.649-1.887.703-2.43.25-2.531-1.249-2.596-.828-4.32.248-1.015 1.125-3.156 1.875-3.531s1-.219 1.812-.219z"/><path fill="#CCD6DD" d="M28.875 7.719c.906-.062 1.188.406 1.594.594.406.188 1.5.594 1.75.688.25.094.688.625.688-.219 0-.439.219-1.531.312-2.031.133-.709.25-1.375.25-1.375s-.719-1.031-.688-1.344c.031-.312.375-1.125.781-1.312.406-.188 1.562.469 1.938.719s.219.875-.062 1.281c-.281.406-.562 1.115-.562 1.774 0 .844.019 3.264-.2 4.921-.074.561-.844.562-1.406.5s-3.051-.476-4.582-.82c-1.532-.345-.719-3.314.187-3.376zm-4.024-6.362c1.404-.299 2.624.453 3.105 1.26.826 1.383-.332 3.458.138 4.32.436.8.126.986-.5 1.406-.612.411-1.263.932-2.531.906-1.465-.029-1.676-.859-1.5-1.562.086-.342.087-.676.028-.998 0 0-.586-.469-.615-2.021-.023-1.201-.323-2.842 1.875-3.311z"/><path fill="#F5F8FA" d="M27.75 4.208c-.18 1.623-1.391 3.51-2.719 3.51-1.328 0-2.198-1.312-2.349-2.905-.15-1.587 1.466-3.592 2.849-3.502 1.325.088 2.395 1.314 2.219 2.897z"/><path fill="#292F33" d="M27.34 4.15c-.18 1.623-1.168 3.256-2.496 3.256s-2.366-1.332-2.22-3.236c.138-1.796 1.212-2.979 2.595-2.889 1.325.087 2.297 1.285 2.121 2.869z"/><path fill="#66757F" d="M14.089 11.742l-.664-.14C6.129 10.081.168 9.073.11 9.352c-.058.279 5.809 1.739 13.104 3.26l.665.137.21-1.007z"/><path fill="#66757F" d="M15.208 12.501c-.183.878-.784 1.497-1.341 1.38-.557-.116-1.106-.974-.922-1.852.183-.879 1.029-1.446 1.586-1.329.557.116.86.923.677 1.801z"/></svg> \ No newline at end of file |