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/1f33f.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/1f33f.svg')
-rw-r--r-- | public/emoji/1f33f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f33f.svg b/public/emoji/1f33f.svg index 48fb3f3fd..9243e9685 100644 --- a/public/emoji/1f33f.svg +++ b/public/emoji/1f33f.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><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="m 8.49,26.768 c 0.875,-2.87 2.748,-3.868 6.493,-5.865 l 0,0 c 1.996,3.746 2.994,5.62 2.12,8.488 l 0,0 c -0.876,2.874 -3.187,5.307 -6.495,5.867 l 0,0 C 8.175,32.947 7.614,29.64 8.49,26.768"/></clipPath><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 2.943,22.462 C 1.98,20.309 2.502,18.008 3.841,16.374 l 0,0 c 1.34,-1.632 2.826,-1.777 5.795,-2.071 l 0,0 c 0.294,2.971 0.44,4.457 -0.898,6.087 l 0,0 c -1.09,1.33 -2.722,2.215 -4.533,2.215 l 0,0 c -0.413,0 -0.835,-0.046 -1.262,-0.143"/></clipPath><clipPath id="clipPath68" clipPathUnits="userSpaceOnUse"><path id="path70" d="m 14.645,18.387 c 2.377,-3.037 3.566,-4.558 6.272,-4.889 l 0,0 c 2.709,-0.328 5.583,0.691 7.267,3.236 l 0,0 c -1.024,2.873 -3.564,4.556 -6.273,4.888 l 0,0 c -0.298,0.037 -0.581,0.055 -0.853,0.055 l 0,0 c -2.207,-0.001 -3.708,-1.175 -6.413,-3.29"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" d="M 8.861,8.972 C 11.226,6.236 12.41,4.87 14.959,4.684 l 0,0 c 2.551,-0.183 5.192,0.907 6.652,3.365 l 0,0 c -1.089,2.642 -3.547,4.101 -6.099,4.287 l 0,0 c -0.171,0.013 -0.337,0.019 -0.498,0.019 l 0,0 c -2.241,0 -3.602,-1.178 -6.153,-3.383"/></clipPath><clipPath id="clipPath92" clipPathUnits="userSpaceOnUse"><path id="path94" d="m 26.789,33.139 c -2.43,-1.022 -3.138,-2.75 -4.549,-6.203 l 0,0 c 3.453,-1.411 5.179,-2.117 7.614,-1.097 l 0,0 c 2.431,1.023 4.354,3.26 4.548,6.204 l 0,0 c -1.368,1.176 -3,1.705 -4.62,1.705 l 0,0 c -1.026,0 -2.048,-0.213 -2.993,-0.609"/></clipPath><clipPath id="clipPath104" clipPathUnits="userSpaceOnUse"><path id="path106" 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(20.917,13.498)" id="g20"><path id="path22" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.706,0.331 -3.895,1.852 -6.273,4.889 3.04,2.376 4.559,3.565 7.266,3.235 C 3.703,7.792 6.243,6.108 7.267,3.235 5.583,0.691 2.709,-0.328 0,0"/></g><g transform="translate(14.9585,4.6836)" id="g24"><path id="path26" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.549,0.187 -3.733,1.553 -6.098,4.288 -3.363,6.652 -1.996,7.835 0.554,7.652 3.105,7.467 5.563,6.008 6.652,3.365 5.193,0.907 2.551,-0.183 0,0"/></g><g transform="translate(8.7383,20.3906)" id="g28"><path id="path30" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.338,-1.631 1.191,-3.117 0.898,-6.088 -2.969,0.294 -4.455,0.44 -5.795,2.071 -1.339,1.635 -1.861,3.935 -0.898,6.089 C -3.494,2.595 -1.339,1.632 0,0"/></g><g transform="translate(29.8535,25.8389)" id="g32"><path id="path34" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.435,-1.02 -4.16,-0.314 -7.613,1.097 -6.202,4.55 -5.495,6.277 -3.064,7.3 -0.63,8.321 2.314,8.125 4.548,6.204 4.355,3.26 2.432,1.023 0,0"/></g><g transform="translate(17.1025,29.3916)" id="g36"><path id="path38" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.874,-2.869 -0.124,-4.742 -2.119,-8.488 -3.745,1.996 -5.619,2.994 -6.494,5.864 -0.876,2.872 -0.315,6.18 2.118,8.49 C -3.187,5.306 -0.876,2.874 0,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(14.8281,20.9917)" id="g48"><path id="path50" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.082,-2.994 -8.905,3.805 -9.151,5.741 -0.246,1.935 -0.441,5.669 0.998,7.391 1.439,1.723 2.329,3.268 3.163,2.362 C -3.828,14.231 -0.083,2.995 0,0"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(2.3218,22.8179)" id="g60"><path id="path62" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.385,-0.98 6.194,-6.339 7.315,-8.515 8.436,-10.691 4.127,-10.798 2.161,-9.186 0.194,-7.575 -2.628,-6.238 -2.018,-4.027 -1.408,-1.816 0,0 0,0"/></g></g></g><g id="g64"><g clip-path="url(#clipPath68)" id="g66"><g transform="translate(15.0264,18.748)" id="g72"><path id="path74" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.881,-0.107 11.15,-0.941 14.903,-2.691 18.657,-4.441 16.819,2.436 13.08,3.688 9.341,4.938 5.673,6.946 3.039,5.091 0.406,3.236 0,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(8.1113,9.0088)" id="g84"><path id="path86" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.567,0.24 9.015,1.328 14.514,-1.412 20.012,-4.152 13.515,5.339 10.2,5.529 6.887,5.722 5.596,7.322 3.186,5.161 0.776,2.998 0,0 0,0"/></g></g></g><g id="g88"><g clip-path="url(#clipPath92)" id="g90"><g transform="translate(22.2637,26.7651)" id="g96"><path id="path98" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.507,0.989 10.404,5.679 13.838,5.379 17.27,5.078 9.706,-4.47 1.688,-2.247 -0.651,-1.599 0,0 0,0"/></g></g></g><g id="g100"><g clip-path="url(#clipPath104)" id="g102"><g transform="translate(4.751,0.9395)" id="g108"><path id="path110" style="fill:#a06253;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.584,0.091 -1.363,0.831 -1.273,1.416 0.545,3.563 2.858,12.168 18.297,24.755 0.458,0.375 0.976,0.66 1.365,0.212 0.39,-0.447 -0.052,-0.949 -0.498,-1.339 C 4.603,13.474 2.377,4.309 1.868,0.979 1.777,0.393 0.585,-0.089 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M20.917 22.502c-2.706-.331-3.895-1.852-6.273-4.889 3.039-2.376 4.559-3.565 7.266-3.235 2.71.332 5.25 2.016 6.273 4.889-1.683 2.543-4.557 3.563-7.266 3.235zm-5.959 8.814c-2.549-.187-3.733-1.553-6.098-4.288 2.735-2.364 4.102-3.547 6.652-3.364 2.551.185 5.009 1.644 6.098 4.287-1.459 2.458-4.1 3.548-6.652 3.365zm-6.22-15.707c1.338 1.631 1.191 3.117.898 6.088-2.97-.294-4.456-.44-5.795-2.071-1.339-1.634-1.861-3.935-.898-6.088 2.301-.524 4.456.439 5.795 2.071zm21.116-5.448c-2.435 1.02-4.16.314-7.613-1.097 1.411-3.453 2.118-5.18 4.549-6.203 2.434-1.021 5.378-.826 7.612 1.096-.194 2.944-2.117 5.181-4.548 6.204zM17.103 6.608c.874 2.869-.124 4.742-2.119 8.488-3.745-1.996-5.619-2.994-6.494-5.864-.876-2.872-.315-6.18 2.118-8.49 3.308.561 5.619 2.993 6.495 5.866z"/><path fill="#A6D388" d="M8.49 9.232c.862 2.828 2.702 3.843 6.338 5.781v-.005c-.07-2.521-2.733-10.876-4.267-14.214C8.172 3.102 7.62 6.381 8.49 9.232zm-5.592 4.429c-.89 2.118-.371 4.362.943 5.965 1.34 1.632 2.826 1.777 5.795 2.071-.997-1.937-4.911-6.388-6.738-8.036z"/><path fill="#5C913B" d="M21.91 14.378c-2.563-.312-4.077.75-6.808 2.879 1.746.105 8.786.745 13.06 2.037.006-.01.015-.017.021-.027-1.023-2.873-3.563-4.557-6.273-4.889zm-.304 13.565c-1.091-2.637-3.545-4.094-6.094-4.279-2.5-.179-3.87.961-6.498 3.232 2.767-.305 7.905-.87 12.592 1.047z"/><path fill="#A6D388" d="M22.421 9.137c3.327 1.359 5.043 2.024 7.432 1.024 2.419-1.018 4.332-3.239 4.542-6.16-3.922.761-10.391 4.15-11.974 5.136z"/><path fill="#A06253" d="M4.751 35.061c-.584-.091-1.363-.831-1.273-1.416.546-3.562 2.858-12.168 18.298-24.755.458-.375.976-.659 1.364-.212.391.447-.052.95-.498 1.339C9.354 21.587 7.128 30.751 6.619 34.082c-.091.585-1.283 1.067-1.868.979z"/></svg> \ No newline at end of file |