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/1f917.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/1f917.svg')
-rw-r--r-- | public/emoji/1f917.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f917.svg b/public/emoji/1f917.svg index cc3524873..134167541 100644 --- a/public/emoji/1f917.svg +++ b/public/emoji/1f917.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(34,20)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-8.834 -7.166,-16 -16,-16 -8.836,0 -16,7.166 -16,16 0,8.836 7.164,16 16,16 C -7.166,16 0,8.836 0,0"/></g><g transform="translate(25.8613,19.8711)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.15,0.161 -0.374,0.171 -0.535,0.029 -0.033,-0.029 -3.303,-2.9 -7.326,-2.9 -4.013,0 -7.294,2.871 -7.327,2.9 -0.161,0.142 -0.385,0.13 -0.535,-0.029 -0.149,-0.16 -0.181,-0.424 -0.079,-0.628 0.109,-0.215 2.71,-5.243 7.941,-5.243 5.23,0 7.833,5.028 7.94,5.243 C 0.182,-0.423 0.148,-0.16 0,0"/></g><g transform="translate(13.3926,12.8457)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.539,2.219 c 0,0 -0.542,0.867 -1.411,0.325 C -3.816,2.003 -3.274,1.135 -3.274,1.135 l 1.758,-3.38 c 0,0 0.144,-0.768 -0.918,0.091 -0.463,0.374 -0.197,0.163 -0.197,0.163 l -0.44,0.361 -5.491,4.508 c 0,0 -0.709,0.748 -1.359,-0.042 -0.648,-0.791 0.222,-1.341 0.222,-1.341 l 5.194,-4.266 c -0.121,-0.12 -0.483,-0.534 -0.6,-0.663 l -5.557,4.56 c 0,0 -0.71,0.749 -1.359,-0.041 -0.649,-0.791 0.223,-1.341 0.223,-1.341 l 5.555,-4.562 c -0.102,-0.14 -0.363,-0.476 -0.459,-0.615 l -4.792,3.934 c 0,0 -0.71,0.748 -1.358,-0.042 -0.65,-0.791 0.223,-1.342 0.223,-1.342 l 5.093,-4.183 C -7.6,-7.244 -7.899,-7.713 -7.946,-7.887 l -3.672,3.012 c 0,0 -0.709,0.752 -1.357,-0.041 -0.65,-0.791 0.223,-1.341 0.223,-1.341 l 5.93,-4.868 c 0,0 0.257,-0.213 0.395,-0.326 2.619,-2.152 6.489,-1.772 8.64,0.848 1.971,2.404 1.817,5.853 -0.24,8.07 C 1.244,-1.75 0.612,-0.879 0,0"/></g><g transform="translate(35.583,7.9297)" id="g32"><path id="path34" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.648,0.793 -1.357,0.041 -1.357,0.041 l -3.672,-3.012 c -0.047,0.174 -0.346,0.643 -0.41,0.821 l 5.093,4.183 c 0,0 0.873,0.551 0.223,1.342 -0.648,0.79 -1.358,0.042 -1.358,0.042 l -4.792,-3.934 c -0.096,0.139 -0.357,0.475 -0.459,0.615 l 5.554,4.562 c 0,0 0.873,0.55 0.223,1.341 -0.649,0.79 -1.358,0.041 -1.358,0.041 L -7.87,1.482 c -0.117,0.129 -0.48,0.543 -0.6,0.664 l 5.194,4.265 c 0,0 0.87,0.55 0.222,1.341 -0.65,0.79 -1.359,0.042 -1.359,0.042 l -5.491,-4.508 -0.44,-0.361 c 0,0 0.99,0.841 -0.197,-0.163 -1.188,-1.004 -0.918,-0.091 -0.918,-0.091 l 1.758,3.38 c 0,0 0.543,0.868 -0.324,1.409 -0.87,0.542 -1.412,-0.325 -1.412,-0.325 l -1.538,-2.219 c -0.613,-0.879 -1.244,-1.75 -1.973,-2.533 -2.058,-2.217 -2.212,-5.666 -0.24,-8.07 2.151,-2.62 6.02,-3 8.64,-0.848 0.138,0.113 0.396,0.326 0.396,0.326 l 5.929,4.868 c 0,0 0.872,0.55 0.223,1.341"/></g><g transform="translate(27.6768,25.0171)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.051,0.122 -1.285,2.983 -3.82,2.983 -2.535,0 -3.769,-2.861 -3.82,-2.983 -0.08,-0.187 -0.028,-0.406 0.123,-0.536 0.15,-0.128 0.366,-0.132 0.524,-0.012 0.01,0.009 1.081,0.816 3.173,0.816 2.079,0 3.149,-0.796 3.174,-0.815 0.075,-0.059 0.164,-0.089 0.254,-0.089 0.095,0 0.19,0.033 0.267,0.099 C 0.028,-0.409 0.08,-0.188 0,0"/></g><g transform="translate(16.6768,25.0171)" id="g40"><path id="path42" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.052,0.122 -1.285,2.983 -3.82,2.983 -2.535,0 -3.769,-2.861 -3.82,-2.983 -0.079,-0.187 -0.028,-0.406 0.123,-0.536 0.151,-0.128 0.366,-0.132 0.523,-0.012 0.011,0.009 1.081,0.816 3.174,0.816 2.079,0 3.149,-0.796 3.173,-0.815 0.076,-0.059 0.165,-0.089 0.255,-0.089 0.095,0 0.19,0.033 0.268,0.099 C 0.028,-0.409 0.079,-0.188 0,0"/></g><g transform="translate(11.1821,10.5225)" id="g44"><path id="path46" style="fill:#b55005;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.593,-3.314 0.484,-7.46 0.212,-0.285 0.75,-0.146 0.521,0.187 -0.25,0.365 -2.75,3.896 -0.4,7.057 0,0 -0.381,0.047 -0.605,0.216"/></g><g transform="translate(24.7646,10.4238)" id="g48"><path id="path50" style="fill:#b55005;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 2.594,-3.314 -0.484,-7.46 -0.212,-0.285 -0.75,-0.146 -0.522,0.188 0.25,0.364 2.75,3.895 0.401,7.056 0,0 0.381,0.047 0.605,0.216"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M34 16c0 8.834-7.166 16-16 16-8.836 0-16-7.166-16-16C2 7.164 9.164 0 18 0c8.834 0 16 7.164 16 16"/><path fill="#664500" d="M25.861 16.129c-.15-.161-.374-.171-.535-.029-.033.029-3.303 2.9-7.326 2.9-4.013 0-7.293-2.871-7.326-2.9-.162-.142-.385-.13-.535.029-.149.16-.182.424-.079.628C10.168 16.972 12.769 22 18 22s7.833-5.028 7.94-5.243c.103-.205.07-.468-.079-.628z"/><path d="M13.393 23.154l-1.539-2.219s-.543-.867-1.411-.325c-.867.541-.324 1.409-.324 1.409l1.758 3.38s.144.768-.918-.091c-.463-.374-.197-.163-.197-.163l-.44-.361-5.491-4.508s-.709-.748-1.359.042c-.648.791.223 1.341.223 1.341l5.193 4.266c-.12.12-.482.534-.6.663l-5.557-4.56s-.71-.749-1.358.041c-.65.791.222 1.341.222 1.341l5.555 4.562c-.103.14-.363.476-.459.614l-4.792-3.934s-.71-.748-1.358.042c-.651.791.222 1.342.222 1.342l5.094 4.184c-.064.178-.363.646-.41.82l-3.672-3.012s-.709-.752-1.357.041c-.65.791.222 1.341.222 1.341l5.93 4.868.395.326c2.62 2.151 6.489 1.771 8.64-.849 1.971-2.403 1.817-5.853-.24-8.069-.729-.782-1.36-1.653-1.972-2.532zm22.19 4.916c-.648-.793-1.357-.041-1.357-.041l-3.672 3.012c-.047-.174-.346-.643-.41-.82l5.094-4.184s.873-.551.223-1.342c-.648-.79-1.358-.042-1.358-.042l-4.792 3.934c-.096-.139-.357-.475-.459-.614l5.555-4.562s.873-.55.223-1.341c-.648-.79-1.357-.041-1.357-.041l-5.558 4.56c-.117-.129-.479-.543-.6-.663l5.193-4.266s.87-.55.223-1.341c-.65-.79-1.359-.042-1.359-.042l-5.491 4.508-.439.361s.99-.841-.197.163c-1.188 1.004-.918.091-.918.091l1.758-3.38s.543-.868-.324-1.409c-.869-.542-1.411.325-1.411.325l-1.538 2.219c-.613.879-1.244 1.75-1.974 2.533-2.058 2.217-2.212 5.666-.239 8.069 2.15 2.62 6.02 3 8.64.849l.396-.326 5.93-4.868c-.005-.001.867-.551.218-1.342z" fill="#F4900C"/><path fill="#664500" d="M27.677 10.983C27.626 10.861 26.392 8 23.856 8c-2.534 0-3.768 2.861-3.819 2.983-.08.188-.028.406.123.536.149.128.365.132.523.012.01-.009 1.081-.816 3.173-.816 2.079 0 3.149.797 3.174.816.075.059.165.089.255.089.095 0 .189-.034.267-.099.153-.129.205-.35.125-.538zm-11 0C16.625 10.861 15.392 8 12.856 8c-2.534 0-3.768 2.861-3.82 2.983-.079.188-.028.406.124.536.15.128.366.132.523.012.011-.009 1.081-.816 3.173-.816 2.08 0 3.149.797 3.173.816.076.059.165.089.255.089.095 0 .189-.034.267-.099.154-.129.205-.35.126-.538z"/><path fill="#B55005" d="M11.182 25.478s-2.593 3.314.484 7.46c.212.285.75.146.521-.188-.25-.364-2.75-3.896-.4-7.057 0 0-.381-.047-.605-.215zm13.583.098s2.594 3.314-.484 7.46c-.212.285-.75.146-.521-.188.25-.364 2.75-3.896.4-7.057-.001.001.381-.046.605-.215z"/></svg> \ No newline at end of file |