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/1f942.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/1f942.svg')
-rw-r--r-- | public/emoji/1f942.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f942.svg b/public/emoji/1f942.svg index 1540a6b85..30167b03f 100644 --- a/public/emoji/1f942.svg +++ b/public/emoji/1f942.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(13.6787,32.0347)" id="g20"><path id="path22" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.133,-28.043 6.086,-1.773 c 0.927,-0.27 1.204,1.727 -0.711,2.284 -0.928,0.271 -3.694,1.694 -2.744,4.955 0.951,3.261 1.134,3.889 1.395,4.785 0.262,0.899 1.47,1.034 2.473,1.358 1.008,0.326 3.543,1.467 4.825,5.865 1.281,4.398 1.433,12.046 1.433,12.046 L 1.794,2.593 C 1.794,2.593 0.026,0.09 0,0"/></g><g transform="translate(14.6362,31.7554)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.09,-27.764 c 0,0 -5.158,1.503 -6.086,1.774 -0.927,0.27 -0.049,2.124 1.866,1.567 0.927,-0.271 3.986,-0.578 4.936,2.682 0.95,3.262 1.134,3.89 1.395,4.787 0.262,0.898 -0.553,1.557 -1.357,2.473 -0.699,0.796 -2.201,3.141 -0.919,7.539 1.282,4.397 5.262,10.93 5.262,10.93 L 0.837,2.872 C 0.837,2.872 0.026,0.09 0,0"/></g><g transform="translate(11.7808,4.0244)" id="g28"><path id="path30" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.808,0.235 -2.568,0.878 -3.255,2.864 -3.531,3.659 -4.474,3.419 -4.317,2.784 -3.663,0.126 -1.036,-0.769 -0.078,-1.048 0.879,-1.327 0.987,-0.288 0,0"/></g><g transform="translate(23.1943,29.8862)" id="g32"><path id="path34" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.111,-28.481 c 0,0 -5.252,-1.13 -6.196,-1.334 -0.944,-0.203 -1.077,1.809 0.872,2.229 0.944,0.203 3.806,1.424 3.091,4.745 -0.715,3.32 -0.854,3.961 -1.05,4.874 -0.197,0.914 -1.392,1.136 -2.369,1.53 -0.983,0.397 -3.431,1.716 -4.395,6.194 -0.963,4.478 -0.568,12.118 -0.568,12.118 l 3.899,0.84 c 0,0 1.584,-2.624 1.605,-2.715"/></g><g transform="translate(19.252,32.0977)" id="g36"><path id="path38" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.562,-0.336 c 0,0 -0.29,-5.637 0.241,-10.066 C -0.428,-7.166 -0.107,-2.36 0,0"/></g><g transform="translate(22.2188,29.6763)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 6.087,-28.271 c 0,0 5.252,1.131 6.196,1.335 0.946,0.203 0.201,2.115 -1.748,1.695 -0.944,-0.203 -4.017,-0.291 -4.732,3.03 -0.716,3.32 -0.853,3.96 -1.05,4.874 -0.196,0.915 0.662,1.513 1.53,2.37 0.754,0.743 2.419,2.974 1.455,7.453 C 6.774,-3.036 3.271,3.764 3.271,3.764 L -0.63,2.925 c 0,0 0.61,-2.834 0.63,-2.925"/></g><g transform="translate(23.0859,1.8125)" id="g44"><path id="path46" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.823,0.177 2.624,0.691 3.451,2.624 3.783,3.396 4.706,3.091 4.505,2.468 3.663,-0.137 0.979,-0.841 0.003,-1.052 -0.972,-1.262 -1.005,-0.216 0,0"/></g><g transform="translate(25.415,14.1982)" id="g48"><path id="path50" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.933,0.279 4.238,2.244 4.051,4.861 3.926,6.612 3.479,6.605 2.368,5.952 1.153,5.235 -2.448,3.723 -5.048,6.17 -6.638,7.666 -6.509,10.189 -6.793,8.694 -7.043,7.385 -6.792,5.437 -5.516,2.991 -4.394,0.841 -2.347,-0.342 0,0"/></g><g transform="translate(10.7554,16.4727)" id="g52"><path id="path54" style="fill:#9d0522;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.932,0.28 -4.244,2.244 -4.051,4.861 -3.975,5.89 -3.071,5.284 -2.012,4.55 -0.485,3.49 3.027,3.403 5.217,5.734 6.682,7.292 6.46,9.628 6.744,8.133 6.994,6.824 6.792,5.438 5.516,2.992 4.394,0.841 2.347,-0.341 0,0"/></g><g transform="translate(29,32)" id="g56"><path id="path58" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.55,0 -1,0.45 -1,1 l 0,2 C -1,3.55 -0.55,4 0,4 0.55,4 1,3.55 1,3 L 1,1 C 1,0.45 0.55,0 0,0"/></g><g transform="translate(30.5557,29.9941)" id="g60"><path id="path62" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.062,0.062 c -0.372,0.372 -0.372,0.98 0,1.352 l 3.598,3.598 c 0.371,0.372 0.981,0.372 1.353,0 L 4.95,4.95 C 5.322,4.578 5.322,3.969 4.95,3.597 L 1.353,0 C 0.98,-0.372 0.372,-0.372 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FA743E" d="M29.156 4.159c-.492-.245-.694-.849-.449-1.341l1.07-2.146c.245-.492.849-.694 1.341-.449s.694.849.449 1.341l-1.07 2.146c-.245.492-.849.694-1.341.449m.98 2.199l-.027-.083c-.167-.499.104-1.043.603-1.21l3.904-1.296c.498-.167 1.044.104 1.21.603l.027.083c.167.499-.105 1.044-.604 1.211l-3.903 1.295c-.498.167-1.043-.104-1.21-.603m.514 2.264c-.245.492-.043 1.096.449 1.341l2.146 1.07c.492.245 1.096.043 1.341-.449s.043-1.096-.449-1.341l-2.146-1.07c-.492-.245-1.096-.043-1.341.449"/><path fill="#E1E8ED" d="M11.13 32.026c-1.042-.349-3.118-.951-2.678-4.476l.646-5.174c.121-.97 1.177-1.265 2.329-1.811 1.001-.475 3.415-2.103 4.009-6.857.518-4.156-.265-10.722-.47-12.307L10.388.872l-4.58-.53c-.562 1.497-2.823 7.71-3.267 11.875-.507 4.764 1.472 6.9 2.338 7.591.997.794 1.958 1.322 1.854 2.294-.103.972-.177 1.652-.552 5.185-.376 3.532-2.535 3.644-3.629 3.746-2.077.193-2.192 1.882-1.188 1.988 1.006.108 5.235.603 5.235.603s4.231.484 5.234.608c1.002.127 1.275-1.544-.703-2.206z"/><path fill="#FFCC4D" d="M13.783 3.516c-.383.243-2.359 1.308-4.743 1.508-1.653.14-3.701-.07-4.037 1.041-.678 2.241-1.217 4.221-1.434 6.262-.412 3.865.928 5.729 1.73 6.48l.022.019c.098.079 1.052.808 2.85 1.016 1.786.207 2.917-.273 3.047-.332.014-.006.018-.009.031-.016.953-.549 2.68-2.058 3.161-5.913.354-2.842.069-6.934-.194-9.597-.02-.204-.05-.711-.433-.468z"/><circle fill="#FFD983" cx="12.352" cy="6.533" r=".645"/><circle fill="#FFD983" cx="10.241" cy="8.682" r=".645"/><circle fill="#FFD983" cx="12.661" cy="11.159" r=".645"/><circle fill="#FFD983" cx="9.173" cy="12.769" r=".645"/><circle fill="#FFD983" cx="7.112" cy="10.095" r=".645"/><circle fill="#FFD983" cx="6.768" cy="7.044" r=".645"/><path fill="#E1E8ED" d="M20.793 33.477c1.042-.349 3.118-.951 2.678-4.476l-.646-5.174c-.121-.97-1.177-1.265-2.329-1.811-1.001-.475-3.415-2.103-4.009-6.857-.518-4.156.265-10.722.47-12.307l4.578-.529 4.578-.529c.562 1.497 2.823 7.71 3.267 11.875.507 4.764-1.472 6.9-2.338 7.591-.997.794-1.958 1.322-1.854 2.294.103.972.177 1.652.552 5.185.376 3.532 2.535 3.644 3.629 3.746 2.077.193 2.192 1.882 1.188 1.988-1.006.108-5.235.603-5.235.603s-4.231.484-5.234.608c-1 .126-1.273-1.544.705-2.207z"/><path fill="#FFCC4D" d="M18.14 4.967c.383.243 2.36 1.308 4.743 1.508 1.653.139 3.702-.071 4.038 1.041.678 2.241 1.217 4.221 1.434 6.262.412 3.865-.928 5.729-1.73 6.48l-.022.019c-.098.079-1.052.808-2.85 1.016-1.786.207-2.917-.273-3.047-.332-.014-.006-.018-.009-.031-.016-.953-.549-2.68-2.058-3.161-5.913-.354-2.842-.069-6.934.194-9.597.019-.204.049-.711.432-.468z"/><circle fill="#FFD983" cx="19.571" cy="7.985" r=".645"/><circle fill="#FFD983" cx="21.682" cy="10.133" r=".645"/><circle fill="#FFD983" cx="19.262" cy="12.61" r=".645"/><circle fill="#FFD983" cx="22.75" cy="14.221" r=".645"/><circle fill="#FFD983" cx="24.811" cy="11.546" r=".645"/><circle fill="#FFD983" cx="25.155" cy="8.496" r=".645"/></svg> \ No newline at end of file |