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-1f3a8.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-1f3a8.svg')
-rw-r--r-- | public/emoji/1f469-1f3ff-200d-1f3a8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f469-1f3ff-200d-1f3a8.svg b/public/emoji/1f469-1f3ff-200d-1f3a8.svg index 930d5ed5d..fc1e99eab 100644 --- a/public/emoji/1f469-1f3ff-200d-1f3a8.svg +++ b/public/emoji/1f469-1f3ff-200d-1f3a8.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(21.9443,30.9312)" id="g20"><path id="path22" style="fill:#0b0200;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.79,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(28,9)" id="g24"><path id="path26" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.34,0 0,3.185 -7.332,0 L -9.672,0 -12,0 c -3.313,0 -7,-2.186 -7,-5.5 l 0,-3.5 26,0 0,3.5 C 7,-2.186 3.315,0 0,0"/></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(13.7339,20.2827)" id="g32"><path id="path34" style="fill:#7c533e;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="g36"><path id="path38" 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="g40"><path id="path42" style="fill:#0b0200;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="g44"><path id="path46" style="fill:#000000;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="g48"><path id="path50" style="fill:#000000;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="g52"><path id="path54" style="fill:#3d2e24;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><g transform="translate(24.7549,35.1172)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.214,-1.001 -2.751,-2.751 -0.537,-1.75 0.188,-0.586 0.917,0 0.729,0.586 2.031,1.61 2.751,1.834 C 1.637,-0.693 0.699,0 0,0"/></g><g transform="translate(23.8379,33.7417)" id="g60"><path id="path62" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 5.13,0 8.814,-1.951 9.177,-4.127 0.399,-2.4 -0.847,-2.751 -0.847,-2.751 0,0 0.574,-1.279 -0.848,-0.917 -1.42,0.363 -4.65,0.466 -10.16,0.917 -5.509,0.452 -8.467,0 -8.467,0 0,0 -0.806,0.062 -0.847,0.917 -0.04,0.856 -0.671,-0.087 -0.846,0.917 C -13.014,-4.039 -7.24,0 0,0"/></g><g transform="translate(27.4697,0)" id="g64"><path id="path66" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.279,3.867 -4.091,7.954 -9.64,9.879 -16.342,12.205 -23.023,10.493 -24.563,6.056 -25.234,4.12 -24.815,1.985 -23.574,0 L 0,0 Z"/></g><g transform="translate(19.7822,4.6182)" id="g68"><path id="path70" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.3,-0.862 0.363,-1.876 1.48,-2.264 2.598,-2.65 3.746,-2.266 4.045,-1.402 4.345,-0.541 3.682,0.474 2.564,0.86 1.447,1.248 0.299,0.863 0,0"/></g><g transform="translate(5.4009,2.999)" id="g72"><path id="path74" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.299,-0.863 0.364,-1.876 1.481,-2.264 2.598,-2.651 3.746,-2.267 4.045,-1.403 4.345,-0.541 3.682,0.473 2.565,0.86 1.448,1.248 0.299,0.863 0,0"/></g><g transform="translate(7.249,7.9795)" id="g76"><path id="path78" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.299,-0.862 0.364,-1.876 1.481,-2.264 2.597,-2.65 3.746,-2.266 4.045,-1.402 4.345,-0.541 3.681,0.474 2.565,0.86 1.448,1.248 0.299,0.863 0,0"/></g><g transform="translate(14.2764,7.9951)" id="g80"><path id="path82" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.272,-0.872 0.423,-1.864 1.552,-2.216 2.68,-2.568 3.816,-2.146 4.088,-1.275 4.359,-0.403 3.664,0.589 2.536,0.94 1.408,1.293 0.272,0.871 0,0"/></g><g transform="translate(1,6)" id="g84"><path id="path86" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.078,1.208 1.394,3.184 3,3 4.665,2.81 3.129,-0.129 3,-1 2.871,-1.871 3.144,-3.938 2,-4 0.454,-4.084 -0.14,-2.186 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#0B0200" 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.79-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="#9266CC" d="M28 27h-2.34v-3.185h-7.332V27H16c-3.313 0-7 2.186-7 5.5V36h26v-3.5c0-3.314-3.685-5.5-7-5.5z"/><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="#7C533E" 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="#0B0200" 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 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="#3D2E24" 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="#66757F" d="M33.015 6.385c-.341-2.045-3.616-3.89-8.267-4.105.346-.222.672-.402.924-.48.72-.224-.218-.917-.917-.917 0 0-1.092.505-1.93 1.41C16.069 2.641 10.832 6.344 11 7.302c.175 1.004.806.061.846.917.041.855.847.917.847.917s2.958-.452 8.467 0c5.51.451 8.74.554 10.16.917 1.422.362.848-.917.848-.917s1.246-.351.847-2.751z"/><path fill="#D99E82" d="M27.47 36c-.279-3.867-4.091-7.954-9.64-9.879-6.702-2.326-13.383-.614-14.923 3.823-.671 1.936-.252 4.071.989 6.056H27.47z"/><path fill="#5C913B" d="M19.782 31.382c-.3.862.363 1.876 1.48 2.264 1.117.387 2.266.002 2.564-.861.3-.861-.363-1.876-1.48-2.263-1.117-.388-2.265-.003-2.564.86"/><path fill="#269" d="M5.401 33.001c-.299.863.364 1.876 1.481 2.264 1.117.388 2.265.003 2.564-.86.3-.862-.363-1.876-1.48-2.264-1.117-.388-2.266-.003-2.565.86"/><path fill="#DD2E44" d="M7.249 28.021c-.299.862.364 1.876 1.481 2.264 1.116.387 2.265.002 2.564-.861.3-.861-.364-1.876-1.48-2.263-1.117-.389-2.266-.004-2.565.86"/><path fill="#FFCC4D" d="M14.276 28.005c-.272.872.423 1.864 1.552 2.216 1.128.353 2.265-.069 2.536-.94.271-.872-.424-1.864-1.552-2.216-1.128-.353-2.264.069-2.536.94"/><path fill="#7C533E" d="M1 30c.078-1.208 1.394-3.184 3-3 1.665.19.129 3.129 0 4s.144 2.938-1 3c-1.546.084-2.14-1.814-2-4"/></svg> \ No newline at end of file |