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/1f927.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/1f927.svg')
-rw-r--r-- | public/emoji/1f927.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f927.svg b/public/emoji/1f927.svg index ad0eb94a5..dc86ab356 100644 --- a/public/emoji/1f927.svg +++ b/public/emoji/1f927.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(30.5996,18.7998)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.114,0.085 -1.931,1.426 -4.646,2.344 -4.619,2.459 -4.6,2.577 -4.6,2.7 -4.6,3.069 -4.738,3.403 -4.959,3.664 -3.156,4.185 -1.625,4.2 -1.598,4.2 -1.047,4.202 -0.6,4.65 -0.601,5.202 -0.602,5.753 -1.048,6.2 -1.6,6.2 -1.82,6.2 -7.051,6.163 -10.307,2.907 -10.593,2.621 -10.679,2.191 -10.523,1.817 -10.369,1.444 -10.004,1.2 -9.6,1.2 c 4.59,0 8.364,-2.772 8.402,-2.801 0.18,-0.133 0.389,-0.198 0.597,-0.198 0.305,0 0.606,0.139 0.802,0.401 C 0.531,-0.956 0.441,-0.331 0,0"/></g><g transform="translate(15.707,21.707)" id="g28"><path id="path30" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.255,3.255 -8.486,3.293 -8.707,3.293 -0.552,0 -0.999,-0.447 -0.999,-0.999 -0.001,-0.551 0.446,-1 0.998,-1.001 0.026,0 1.558,-0.016 3.36,-0.536 -0.22,-0.261 -0.359,-0.595 -0.359,-0.964 0,-0.123 0.019,-0.241 0.047,-0.356 -2.716,-0.918 -4.533,-2.259 -4.647,-2.344 -0.442,-0.331 -0.531,-0.958 -0.2,-1.4 0.196,-0.262 0.497,-0.4 0.801,-0.4 0.208,0 0.419,0.065 0.599,0.2 0.037,0.028 3.787,2.8 8.4,2.8 0.404,0 0.769,0.244 0.924,0.617 C 0.372,-0.716 0.286,-0.286 0,0"/></g><g transform="translate(16,7)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2,5 13,5 13,3 13,2 5,4 0,0"/></g><g transform="translate(18.4059,17.9672)" id="g36"><path id="path38" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.678,-2.676 -3.974,-15.524 -5.25,-16.8 -1.05,-1.05 -4.2,-1.05 -5.25,1.05 -1.05,2.1 -4.2,0 -5.25,1.05 -2.1,2.1 1.05,3.15 0,5.25 -1.05,2.1 -3.15,3.15 -1.05,5.25 2.1,2.1 7.35,1.05 10.5,3.15 3.15,2.1 5.249,2.1 6.3,1.05"/></g><g transform="translate(17.3217,16.128)" id="g40"><path id="path42" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.016,0.062 -0.053,0.113 -0.079,0.17 -0.03,0.066 -0.051,0.135 -0.094,0.194 -0.161,0.217 -0.405,0.374 -0.694,0.415 0,0 -0.001,0 -0.001,0 C -1.005,0.798 -1.142,0.79 -1.274,0.757 -1.364,0.734 -1.443,0.685 -1.523,0.64 -1.561,0.619 -1.604,0.61 -1.639,0.584 -1.75,0.502 -1.845,0.399 -1.917,0.279 c -2.934,-4.89 -9.942,-7.944 -10.013,-7.975 -0.532,-0.229 -0.778,-0.846 -0.55,-1.379 0.171,-0.398 0.558,-0.636 0.965,-0.636 0.138,0 0.279,0.027 0.413,0.085 0.224,0.096 4.056,1.771 7.426,4.713 -2.068,-3.825 -5.23,-5.996 -5.274,-6.025 -0.481,-0.323 -0.61,-0.974 -0.288,-1.456 0.203,-0.303 0.535,-0.467 0.874,-0.467 0.2,0 0.402,0.058 0.581,0.177 0.273,0.182 6.702,4.549 7.806,12.273 C 0.043,-0.272 0.034,-0.133 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18-9.94 0-18-8.059-18-18C0 8.06 8.06 0 18 0c9.941 0 18 8.06 18 18"/><path fill="#664500" d="M30.6 17.2c-.114-.085-1.931-1.426-4.646-2.344.026-.115.046-.233.046-.356 0-.369-.139-.703-.359-.964 1.802-.52 3.334-.536 3.361-.536.551-.002.998-.45.997-1.002-.001-.551-.447-.998-.999-.998-.221 0-5.451.038-8.707 3.293-.286.286-.372.716-.217 1.09.154.373.52.617.924.617 4.59 0 8.363 2.772 8.401 2.801.18.134.39.198.598.198.305 0 .605-.139.802-.4.33-.443.24-1.068-.201-1.399zm-14.893-2.907C12.452 11.038 7.221 11 7 11c-.552 0-.999.447-.999.998-.001.552.446 1 .998 1.002.026 0 1.558.016 3.361.536-.221.261-.36.595-.36.964 0 .123.019.241.047.356-2.716.918-4.533 2.259-4.647 2.344-.442.331-.531.958-.2 1.399.196.263.497.401.801.401.208 0 .419-.065.599-.2.037-.028 3.787-2.8 8.4-2.8.404 0 .769-.244.924-.617.155-.374.069-.804-.217-1.09zM16 29c2-5 13-5 13-3 0 1-8-1-13 3z"/><path fill="#CCD6DD" d="M18.406 18.033c2.678 2.676-3.974 15.524-5.25 16.8-1.05 1.05-4.2 1.05-5.25-1.05-1.05-2.1-4.2 0-5.25-1.05-2.1-2.1 1.05-3.15 0-5.25s-3.15-3.15-1.05-5.25 7.35-1.05 10.5-3.15c3.15-2.1 5.249-2.1 6.3-1.05z"/><path fill="#F5F8FA" d="M17.322 19.872c-.016-.062-.053-.113-.079-.17-.03-.066-.05-.135-.094-.194-.161-.218-.405-.374-.694-.415h-.001c-.137-.019-.274-.011-.406.022-.091.023-.169.071-.249.117-.038.021-.08.03-.115.056-.111.082-.206.185-.278.305-2.934 4.89-9.942 7.944-10.013 7.975-.533.229-.779.846-.55 1.379.171.398.558.636.965.636.138 0 .278-.027.413-.085.223-.096 4.055-1.77 7.425-4.712-2.068 3.825-5.23 5.995-5.273 6.025-.481.323-.61.974-.288 1.456.203.302.535.467.874.467.2 0 .402-.057.581-.176.273-.183 6.703-4.549 7.807-12.274.018-.14.009-.279-.025-.412z"/></svg> \ No newline at end of file |