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/1f98b.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/1f98b.svg')
-rw-r--r-- | public/emoji/1f98b.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f98b.svg b/public/emoji/1f98b.svg index 457b722a5..22c6ead8f 100644 --- a/public/emoji/1f98b.svg +++ b/public/emoji/1f98b.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(19,16.5)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1,-7.5 -1,-9.5 -1,-9.5 0,0 -2,2 -1,9.5 0.913,6.843 -2.687,9.159 1,9.159 3.688,0 0.088,-2.316 1,-9.159"/></g><g transform="translate(17.5894,25.7407)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.133,-0.242 0.045,-0.546 -0.197,-0.679 -0.242,-0.133 -0.546,-0.045 -0.679,0.197 l -2.651,4.819 c -0.134,0.242 -0.046,0.546 0.196,0.679 0.243,0.133 0.546,0.045 0.68,-0.197 L 0,0 Z"/></g><g transform="translate(18.4111,25.7407)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.133,-0.242 -0.045,-0.546 0.197,-0.679 0.242,-0.133 0.545,-0.045 0.679,0.197 L 3.527,4.337 C 3.66,4.579 3.572,4.883 3.33,5.016 3.088,5.149 2.785,5.061 2.651,4.819 L 0,0 Z"/></g><g transform="translate(18,17)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -9.962,0.477 -15.645,-0.835 -15,-9 0.727,-9.191 15,0 15,3 l 0,6 z"/></g><g transform="translate(8.1904,5.1025)" id="g36"><path id="path38" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.744,0.001 -3.217,0.343 -3.65,2.438 -0.491,2.374 0.108,4.769 0.975,5.931 1.779,2.384 6.457,2.521 11.554,2.528 l 0,-5 C 8.879,5.493 8.015,4.081 5.931,2.497 3.874,0.934 1.658,0 0,0 Z"/></g><g transform="translate(5.5151,13.4717)" id="g40"><path id="path42" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.302,-0.404 -0.516,-0.882 -0.652,-1.426 5.44,0.357 9.955,1.653 12.207,3.406 l 0,0.548 C 6.458,2.521 1.779,2.384 0,0"/></g><g transform="translate(9.3574,7.6035)" id="g44"><path id="path46" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.978 -0.792,-1.771 -1.77,-1.771 -0.979,0 -1.772,0.793 -1.772,1.771 0,0.979 0.793,1.771 1.772,1.771 C -0.792,1.771 0,0.979 0,0"/></g><g transform="translate(12.3813,7.9922)" id="g48"><path id="path50" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.718 -0.582,-1.301 -1.3,-1.301 -0.719,0 -1.301,0.583 -1.301,1.301 0,0.719 0.582,1.301 1.301,1.301 C -0.582,1.301 0,0.719 0,0"/></g><g transform="translate(14.5415,9.0332)" id="g52"><path id="path54" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.575 -0.466,-1.041 -1.042,-1.041 -0.575,0 -1.041,0.466 -1.041,1.041 0,0.575 0.466,1.042 1.041,1.042 C -0.466,1.042 0,0.575 0,0"/></g><g transform="translate(15.9414,10.0752)" id="g56"><path id="path58" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.387 -0.314,-0.7 -0.7,-0.7 -0.386,0 -0.7,0.313 -0.7,0.7 0,0.387 0.314,0.7 0.7,0.7 C -0.314,0.7 0,0.387 0,0"/></g><g transform="translate(17.974,17)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 9.962,0.477 15.645,-0.835 15,-9 14.273,-18.191 0,-9 0,-6 l 0,6 z"/></g><g transform="translate(27.7835,5.1025)" id="g64"><path id="path66" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.744,0.001 3.217,0.343 3.65,2.438 4.141,4.812 3.542,7.207 2.675,8.369 0.896,10.753 -3.782,10.89 -8.879,10.897 l 0,-5 c 0,-0.404 0.864,-1.816 2.948,-3.4 C -3.874,0.934 -1.658,0 -0.001,0 L 0,0 Z"/></g><g transform="translate(30.4588,13.4717)" id="g68"><path id="path70" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.302,-0.404 0.516,-0.882 0.652,-1.426 -5.44,0.357 -9.955,1.653 -12.207,3.406 l 0,0.548 C -6.458,2.521 -1.779,2.384 0,0"/></g><g transform="translate(26.6166,7.6035)" id="g72"><path id="path74" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.978 0.792,-1.771 1.77,-1.771 0.979,0 1.772,0.793 1.772,1.771 0,0.979 -0.793,1.771 -1.772,1.771 C 0.792,1.771 0,0.979 0,0"/></g><g transform="translate(23.5927,7.9922)" id="g76"><path id="path78" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.718 0.582,-1.301 1.3,-1.301 2.019,-1.301 2.601,-0.718 2.601,0 2.601,0.719 2.019,1.301 1.3,1.301 0.582,1.301 0,0.719 0,0"/></g><g transform="translate(21.4325,9.0332)" id="g80"><path id="path82" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.575 0.466,-1.041 1.042,-1.041 0.575,0 1.042,0.466 1.042,1.041 0,0.575 -0.467,1.042 -1.042,1.042 C 0.466,1.042 0,0.575 0,0"/></g><g transform="translate(20.0326,10.0752)" id="g84"><path id="path86" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.387 0.313,-0.7 0.7,-0.7 1.086,-0.7 1.4,-0.387 1.4,0 1.4,0.387 1.086,0.7 0.7,0.7 0.313,0.7 0,0.387 0,0"/></g><g transform="translate(18,22)" id="g88"><path id="path90" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -4,7 -16.536,11.336 -17,10 -19,4.25 -14.413,-3.609 -12.545,-5.04 -10.001,-6.988 0,-7 0,-6 l 0,6 z"/></g><g transform="translate(5.3752,19.3847)" id="g92"><path id="path94" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.834,1.195 -2.146,3.975 -2.405,8.615 0.07,8.481 8.517,7.923 11.685,2.343 l 0,-5.193 C 10.698,-3.161 8.704,-3.06 5.127,-2.663 1.55,-2.266 0.834,-1.194 0,0"/></g><g transform="translate(3.2225,25.6247)" id="g96"><path id="path98" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.201,-1.329 0.48,-2.463 0.796,-3.394 8.704,-2.239 13.79,-6.371 13.79,-6.371 13.79,-6.371 10.708,-0.318 0,0"/></g><g transform="translate(16.9136,17.125)" id="g100"><path id="path102" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -4.096,4.624 -12.213,3.427 0.238,-0.486 0.471,-0.875 0.675,-1.167 0.084,-0.12 0.167,-0.239 0.251,-0.356 C -5.398,2.955 0,0 0,0"/></g><g transform="translate(17.974,22)" id="g104"><path id="path106" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 4,7 16.536,11.336 17,10 19,4.25 14.413,-3.609 12.545,-5.04 10.001,-6.988 0,-7 0,-6 l 0,6 z"/></g><g transform="translate(30.5988,19.3847)" id="g108"><path id="path110" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.834,1.195 2.146,3.975 2.405,8.615 -0.07,8.481 -8.517,7.923 -11.685,2.343 l 0,-5.193 c 0.987,-0.311 2.981,-0.21 6.558,0.187 C -1.55,-2.266 -0.834,-1.194 0,0"/></g><g transform="translate(32.7514,25.6247)" id="g112"><path id="path114" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.201,-1.329 -0.48,-2.463 -0.796,-3.394 -7.908,1.155 -12.994,-2.977 -12.994,-2.977 0,0 3.082,6.053 13.79,6.371"/></g><g transform="translate(19.0604,17.125)" id="g116"><path id="path118" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 4.096,4.624 12.213,3.427 11.975,2.941 11.742,2.552 11.538,2.26 11.455,2.14 11.371,2.021 11.287,1.904 5.398,2.955 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#1C6399" d="M20.004 20.243c-.426 0-.858.01-1.294.031-.436 1.268-.468 2.747 0 5.097.328 1.646 2.659 6.299 4.584 7.933.683.58 1.638.884 2.69.884 2.144 0 4.691-1.265 6.157-4.034 3.001-5.671-3.474-9.911-12.137-9.911z"/><path fill="#1C6399" d="M33.666 1.973c-.204 0-.425.021-.663.066-3.182.601-9.302 5.126-14.287 11.771 0 0-.789 5.16-.789 6.194 0 .336 1.264.5 3.058.5 3.717 0 9.709-.705 11.424-2.041 1.898-1.479 3.65-9.804 3.488-14.079-.046-1.175-.662-2.411-2.231-2.411z"/><path fill="#55ACEE" d="M27.098 13.936l6.629-.436s-1.055 3.619-3.102 4.656-7.719 1.5-7.719 1.5 2.33-4.261 3.286-5.29c.237-.256.559-.408.906-.43zm.52-1.952l7.526-8.151s.002 5.365-1.206 8.635c0 0-5.383.379-5.914.391-.703.016-.969-.265-.406-.875zm-6.068 7.672l5.5-8.547c.188-.22.253-.52.171-.798l-.968-3.233-6.722 6.609-.844 6.031 2.863-.062zM27.862 8.88c.172.406.516.5.938.125s6.074-6.094 6-6.218c0 0-2.832-1.194-7.8 3.463 0 0 .69 2.224.862 2.63zm-8.925 12.099l5.373 5.228c.203.178.255.473.125.709L22.06 31.25s-4.187-5.479-3.123-10.271zm7.282 6.301l5.549.741s-1.058 3.845-3.394 4.854c-3.906 1.688-5.312-.625-5.312-.625l2.352-4.562c.151-.298.477-.463.805-.408zm-5.95-6.426l5.375 4.958c.077.066.169.11.269.129l6.119.903s-1.219-3.031-4.429-4.531c-3.71-1.733-7.334-1.459-7.334-1.459z"/><path fill="#292F33" d="M20.004 20.243c-.426 0-.858.01-1.294.031-.436 1.268-.468 2.747 0 5.097.328 1.646 2.659 6.299 4.584 7.933.683.58 1.638.884 2.69.884 2.144 0 4.691-1.265 6.157-4.034 3.001-5.671-3.474-9.911-12.137-9.911zm10.537 9.326c-1.316 2.486-3.05 3.473-4.558 3.473-.767 0-1.704-.313-2.15-.691-1.695-1.439-3.437-4.58-4.25-7.224-.465-1.513-.354-4.022-.354-4.022l.667-.021c5.168 0 9.249 2.058 10.726 4.512.714 1.186.687 2.523-.081 3.973z"/><path fill="#292F33" d="M33.666 3.223c.231 0 .935 0 .981 1.208.102 2.681-.594 6.061-1.397 8.882-.541 1.901-1.586 3.292-2.094 3.687-.56.436-1.863 1.238-3.719 1.563-2.03.355-4.207.833-6.456.833-.827 0-1.433.019-1.794-.021.131-1.218.489-3.551.717-5.064 3.768-4.94 9.711-10.361 13.331-11.044.155-.029.3-.044.431-.044m0-1.25c-.204 0-.425.021-.663.066-3.182.601-9.302 5.126-14.287 11.771 0 0-.789 5.16-.789 6.194 0 .336 1.264.5 3.058.5 3.717 0 9.709-.705 11.424-2.041 1.898-1.479 3.65-9.804 3.488-14.079-.046-1.175-.662-2.411-2.231-2.411z"/><path fill="#1C6399" d="M3.902 30.154c1.466 2.769 4.012 4.034 6.157 4.034 1.052 0 2.007-.304 2.69-.884 1.925-1.633 4.256-6.286 4.584-7.933.468-2.35.436-3.828 0-5.097-.436-.021-.868-.031-1.294-.031-8.665 0-15.139 4.24-12.137 9.911z"/><path fill="#1C6399" d="M2.376 1.973C.807 1.973.19 3.209.146 4.383c-.162 4.275 1.59 12.601 3.488 14.079 1.715 1.336 7.706 2.041 11.424 2.041 1.794 0 3.058-.164 3.058-.5 0-1.033-.789-6.194-.789-6.194C12.341 7.165 6.22 2.64 3.039 2.039c-.238-.045-.459-.066-.663-.066z"/><path fill="#55ACEE" d="M8.943 13.936L2.315 13.5s1.055 3.619 3.102 4.656 7.719 1.5 7.719 1.5-2.33-4.261-3.286-5.29c-.237-.256-.559-.408-.907-.43zm-.519-1.952L.898 3.833s-.002 5.365 1.206 8.635c0 0 5.383.379 5.914.391.703.016.969-.265.406-.875zm6.068 7.672l-5.5-8.547c-.188-.22-.253-.52-.171-.798l.968-3.233 6.722 6.609.844 6.031-2.863-.062zM8.179 8.88c-.172.406-.516.5-.938.125s-6.074-6.094-6-6.218c0 0 2.832-1.194 7.8 3.463.001 0-.69 2.224-.862 2.63zm8.926 12.099l-5.373 5.228c-.203.178-.255.473-.125.709l2.375 4.333c-.001.001 4.187-5.478 3.123-10.27zM9.822 27.28l-5.549.741s1.058 3.845 3.394 4.854c3.906 1.688 5.312-.625 5.312-.625l-2.352-4.562c-.15-.298-.476-.463-.805-.408zm5.951-6.426l-5.375 4.958c-.077.066-.169.11-.269.129l-6.119.903s1.219-3.031 4.429-4.531c3.709-1.733 7.334-1.459 7.334-1.459z"/><path fill="#292F33" d="M3.902 30.154c1.466 2.769 4.012 4.034 6.157 4.034 1.052 0 2.007-.304 2.69-.884 1.925-1.633 4.256-6.286 4.584-7.933.468-2.35.436-3.828 0-5.097-.436-.021-.868-.031-1.294-.031-8.665 0-15.139 4.24-12.137 9.911zm1.518-4.559c1.477-2.454 5.558-4.512 10.726-4.512l.667.021s.111 2.51-.354 4.022c-.813 2.644-2.555 5.785-4.25 7.224-.446.379-1.383.691-2.15.691-1.508 0-3.242-.986-4.558-3.473-.768-1.449-.795-2.786-.081-3.973z"/><path fill="#292F33" d="M2.376 3.223c.131 0 .276.015.431.044 3.619.683 9.563 6.104 13.331 11.044.228 1.513.586 3.846.717 5.064-.361.04-.967.021-1.794.021-2.249 0-4.426-.478-6.456-.833-1.856-.325-3.159-1.127-3.719-1.563-.508-.396-1.553-1.786-2.094-3.687-.803-2.821-1.499-6.201-1.397-8.882.046-1.208.749-1.208.981-1.208m0-1.25C.807 1.973.19 3.209.146 4.383c-.162 4.275 1.59 12.601 3.488 14.079 1.715 1.336 7.706 2.041 11.424 2.041 1.794 0 3.058-.164 3.058-.5 0-1.033-.789-6.194-.789-6.194C12.341 7.165 6.22 2.64 3.039 2.039c-.238-.045-.459-.066-.663-.066z"/><path fill="#292F33" d="M21.887 4.762c-.25-.138-.563-.047-.701.203l-2.74 4.98c-.018.033-.022.068-.032.102-.127-.007-.244-.018-.393-.018-.148 0-.266.01-.392.018-.01-.034-.014-.069-.032-.102l-2.74-4.98c-.138-.25-.452-.341-.702-.203-.25.137-.341.451-.203.701l2.655 4.826c-1.179.784 1.15 3.438.381 9.204-1.033 7.75 1.033 9.817 1.033 9.817s2.067-2.067 1.033-9.817c-.769-5.766 1.56-8.42.381-9.204l2.656-4.826c.137-.25.046-.564-.204-.701z"/></svg> \ No newline at end of file |