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/1f618.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/1f618.svg')
-rw-r--r-- | public/emoji/1f618.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f618.svg b/public/emoji/1f618.svg index 2d920d99f..da48c23a9 100644 --- a/public/emoji/1f618.svg +++ b/public/emoji/1f618.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(36,18)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.941 -8.059,-18 -18,-18 -9.94,0 -18,8.059 -18,18 0,9.94 8.06,18 18,18 C -8.059,18 0,9.94 0,0"/></g><g transform="translate(14,20.5)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.934 -1.119,-3.5 -2.5,-3.5 -3.881,-3.5 -5,-1.934 -5,0 -5,1.933 -3.881,3.5 -2.5,3.5 -1.119,3.5 0,1.933 0,0"/></g><g transform="translate(28.457,18.2031)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.059,0.135 -1.499,3.297 -4.457,3.297 -2.957,0 -4.397,-3.162 -4.457,-3.297 -0.092,-0.207 -0.032,-0.449 0.144,-0.591 0.175,-0.142 0.426,-0.147 0.611,-0.014 0.012,0.009 1.262,0.902 3.702,0.902 2.426,0 3.674,-0.881 3.702,-0.901 0.088,-0.066 0.194,-0.099 0.298,-0.099 0.11,0 0.221,0.037 0.312,0.109 C 0.032,-0.452 0.093,-0.208 0,0"/></g><g transform="translate(5.999,25)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.208,0 -0.419,0.065 -0.599,0.2 -0.442,0.331 -0.531,0.958 -0.2,1.4 3.262,4.35 7.616,4.4 7.8,4.4 0.552,0 1,-0.448 1,-1 C 8.001,4.449 7.556,4.002 7.005,4 6.85,3.998 3.436,3.914 0.801,0.4 0.604,0.138 0.304,0 0,0"/></g><g transform="translate(29.001,22)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.305,0 -0.605,0.138 -0.801,0.4 -3.393,3.856 -7.762,3.028 -7.805,3.02 -8.352,2.909 -8.873,3.263 -8.982,3.804 -9.09,4.345 -8.738,4.872 -8.197,4.98 -7.967,5.028 -2.54,6.052 0.799,1.6 1.131,1.158 1.041,0.531 0.599,0.2 0.419,0.065 0.209,0 0,0"/></g><g transform="translate(20.8711,8)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.335,0.412 2.629,1.156 2.629,2.5 0,2.619 -4.912,2.968 -5.472,2.999 C -3.117,5.525 -3.352,5.306 -3.37,5.031 -3.387,4.758 -3.18,4.521 -2.906,4.501 -2.871,4.499 0.629,4.202 0.629,2.5 0.629,0.798 -2.871,0.501 -2.906,0.499 -2.92,0.498 -2.931,0.49 -2.943,0.488 -2.996,0.482 -3.044,0.471 -3.09,0.448 -3.097,0.445 -3.102,0.44 -3.108,0.437 -3.155,0.411 -3.197,0.381 -3.233,0.34 -3.247,0.325 -3.257,0.309 -3.269,0.292 -3.291,0.26 -3.313,0.229 -3.328,0.19 -3.34,0.161 -3.346,0.13 -3.352,0.099 -3.357,0.075 -3.369,0.055 -3.37,0.031 -3.371,0.021 -3.366,0.011 -3.366,0 c 0,-0.011 -0.005,-0.021 -0.004,-0.031 10e-4,-0.025 0.013,-0.045 0.018,-0.069 0.006,-0.031 0.011,-0.06 0.023,-0.089 0.013,-0.031 0.031,-0.057 0.049,-0.084 0.017,-0.025 0.032,-0.05 0.053,-0.072 0.022,-0.023 0.05,-0.041 0.077,-0.06 0.025,-0.017 0.046,-0.034 0.074,-0.047 0.032,-0.015 0.066,-0.021 0.1,-0.027 0.024,-0.006 0.045,-0.018 0.07,-0.02 0.035,-0.002 3.535,-0.299 3.535,-2.001 0,-1.702 -3.5,-1.999 -3.535,-2.001 -0.274,-0.02 -0.481,-0.257 -0.464,-0.53 0.017,-0.265 0.237,-0.469 0.498,-0.469 0.01,0 0.02,0 0.029,0.001 0.56,0.031 5.472,0.38 5.472,2.999 0,1.344 -1.294,2.088 -2.629,2.5"/></g><g transform="translate(35.4043,8.7783)" id="g44"><path id="path46" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.739,1.516 0.11,3.347 -1.405,4.086 -0.922,0.449 -1.956,0.391 -2.793,-0.06 -0.16,0.937 -0.75,1.789 -1.67,2.238 -1.518,0.74 -3.348,0.109 -4.087,-1.407 -0.106,-0.214 -0.18,-0.436 -0.231,-0.659 -0.774,-2.555 0.64,-6.341 2.193,-7.948 2.223,-0.234 6.077,0.979 7.615,3.161 C -0.233,-0.41 -0.105,-0.215 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#FFCC4D" cx="18" cy="18" r="18"/><ellipse fill="#664500" cx="11.5" cy="15.5" rx="2.5" ry="3.5"/><path fill="#664500" d="M28.457 17.797c-.06-.135-1.499-3.297-4.457-3.297-2.957 0-4.397 3.162-4.457 3.297-.092.207-.032.449.145.591.175.142.426.147.61.014.012-.009 1.262-.902 3.702-.902 2.426 0 3.674.881 3.702.901.088.066.194.099.298.099.11 0 .221-.037.312-.109.177-.142.238-.386.145-.594zM5.999 11c-.208 0-.419-.065-.599-.2-.442-.331-.531-.958-.2-1.4C8.462 5.05 12.816 5 13 5c.552 0 1 .448 1 1 0 .551-.445.998-.996 1-.155.002-3.568.086-6.204 3.6-.196.262-.497.4-.801.4zm23.002 3c-.305 0-.604-.138-.801-.4-2.592-3.456-6.961-2.628-7.004-2.62-.547.11-1.068-.244-1.177-.784-.108-.541.243-1.068.784-1.177.231-.047 5.657-1.072 8.996 3.38.332.442.242 1.069-.2 1.4-.179.136-.389.201-.598.201zm-8.922 13.042c1.335-.412 2.629-1.156 2.629-2.5 0-2.619-4.912-2.968-5.472-2.999-.274-.026-.509.193-.527.468-.017.274.19.511.464.53.035.002 3.535.299 3.535 2.001s-3.5 1.999-3.535 2.001c-.014.001-.024.009-.037.011-.052.006-.101.018-.146.04l-.019.011c-.047.026-.088.057-.125.098-.014.015-.024.031-.036.048-.023.032-.044.063-.059.102-.012.029-.018.061-.024.092-.004.023-.016.044-.018.067 0 .011.004.021.004.031s-.005.021-.004.031c.001.024.013.045.018.068.006.031.011.061.023.09.013.03.031.057.049.084.017.024.032.05.052.071.023.023.05.041.078.061.024.017.046.034.074.047.032.015.066.021.101.027.024.006.044.018.069.02.035.002 3.535.299 3.535 2.001s-3.5 1.999-3.535 2.001c-.274.02-.481.257-.464.53.017.265.237.469.499.469l.028-.001c.56-.031 5.472-.38 5.472-2.999 0-1.345-1.294-2.089-2.629-2.501z"/><path fill="#FFAC33" d="M34.202 25.803c-.236-.79-.779-1.486-1.578-1.875-.922-.449-1.956-.391-2.793.06-.16-.936-.75-1.789-1.67-2.237-1.517-.74-3.348-.11-4.087 1.406-.105.215-.18.437-.23.659-.775 2.556.64 6.341 2.192 7.948 1.23.13 2.953-.198 4.513-.873 1.5-1.46 2.733-3.183 3.653-5.088z"/><path fill="#E75A70" d="M35.654 27.222c.739-1.516.11-3.347-1.405-4.086-.922-.449-1.956-.391-2.793.06-.16-.936-.75-1.789-1.67-2.237-1.517-.74-3.348-.109-4.087 1.406-.105.215-.18.437-.23.659-.774 2.556.64 6.341 2.192 7.948 2.223.234 6.077-.979 7.615-3.161.145-.179.273-.374.378-.589z"/></svg> \ No newline at end of file |