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/1f911.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/1f911.svg')
-rw-r--r-- | public/emoji/1f911.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f911.svg b/public/emoji/1f911.svg index c3c3f6b6f..5616de71c 100644 --- a/public/emoji/1f911.svg +++ b/public/emoji/1f911.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(7,14.7373)" id="g24"><path id="path26" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-3.964 4.596,-9 11,-9 6.404,0 11,5 11,9 0,0 -10.333,-2.756 -22,0"/></g><g transform="translate(12,12.9971)" id="g28"><path id="path30" style="fill:#5d9040;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-6.961 c 0,-3 2,-6 6,-6 4,0 6,3 6,6 l 0,6.92 C 5.709,-1.333 0,0 0,0"/></g><g transform="translate(12.2842,23.6699)" id="g32"><path id="path34" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.756,0.292 -1.471,0.568 -1.471,0.968 0,0.659 0.885,0.693 1.062,0.693 0.625,0 0.935,-0.235 1.209,-0.442 0.211,-0.158 0.429,-0.323 0.731,-0.323 0.565,0 0.822,0.397 0.822,0.766 0,0.736 -0.902,1.256 -1.859,1.473 l 0,0.395 c 0,0.517 -0.421,0.939 -0.939,0.939 -0.517,0 -0.939,-0.422 -0.939,-0.939 l 0,-0.426 C -2.528,2.771 -3.229,1.93 -3.229,0.869 c 0,-1.311 1.293,-1.849 2.433,-2.323 0.817,-0.34 1.589,-0.661 1.589,-1.162 0,-0.366 -0.459,-0.761 -1.202,-0.761 -0.75,0 -1.18,0.299 -1.56,0.564 -0.262,0.183 -0.51,0.356 -0.805,0.356 -0.43,0 -0.767,-0.362 -0.767,-0.824 0,-0.679 0.931,-1.356 2.157,-1.594 l 0,-0.47 c 0,-0.518 0.422,-0.939 0.94,-0.939 0.517,0 0.939,0.421 0.939,0.939 L 0.49,-4.848 c 1.296,0.316 2.062,1.222 2.062,2.459 C 2.552,-0.985 1.137,-0.439 0,0"/></g><g transform="translate(26.6943,21.2637)" id="g36"><path id="path38" style="fill:#664500;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.404 -1.415,1.95 -2.552,2.389 -0.756,0.292 -1.469,0.567 -1.469,0.967 0,0.66 0.883,0.693 1.06,0.693 0.625,0 0.936,-0.234 1.21,-0.441 0.211,-0.159 0.428,-0.323 0.73,-0.323 0.565,0 0.823,0.397 0.823,0.765 0,0.737 -0.903,1.257 -1.859,1.474 l 0,0.394 c 0,0.518 -0.422,0.939 -0.939,0.939 -0.519,0 -0.941,-0.421 -0.941,-0.939 l 0,-0.426 C -5.08,5.16 -5.781,4.318 -5.781,3.257 c 0,-1.311 1.293,-1.848 2.433,-2.323 0.818,-0.339 1.589,-0.66 1.589,-1.161 0,-0.366 -0.459,-0.762 -1.202,-0.762 -0.75,0 -1.18,0.3 -1.559,0.565 -0.262,0.183 -0.51,0.356 -0.805,0.356 -0.431,0 -0.768,-0.362 -0.768,-0.825 0,-0.679 0.931,-1.355 2.156,-1.593 l 0,-0.471 c 0,-0.517 0.423,-0.938 0.942,-0.938 0.517,0 0.938,0.421 0.938,0.938 L -2.06,-2.459 C -0.766,-2.143 0,-1.236 0,0"/></g><g transform="translate(20.9697,4.9307)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.368 -1.379,1.901 -2.487,2.329 -0.738,0.284 -1.434,0.554 -1.434,0.943 0,0.643 0.862,0.675 1.034,0.675 0.61,0 0.912,-0.228 1.18,-0.429 0.205,-0.156 0.418,-0.316 0.713,-0.316 0.55,0 0.801,0.388 0.801,0.747 0,0.717 -0.879,1.224 -1.812,1.437 l 0,0.384 c 0,0.504 -0.411,0.916 -0.916,0.916 -0.505,0 -0.916,-0.412 -0.916,-0.916 l 0,-0.415 C -4.952,5.03 -5.636,4.21 -5.636,3.176 c 0,-1.279 1.261,-1.803 2.373,-2.265 0.797,-0.331 1.549,-0.643 1.549,-1.132 0,-0.357 -0.448,-0.743 -1.173,-0.743 -0.731,0 -1.15,0.292 -1.519,0.551 -0.256,0.178 -0.497,0.347 -0.785,0.347 -0.42,0 -0.748,-0.354 -0.748,-0.804 0,-0.663 0.907,-1.322 2.102,-1.554 l 0,-0.459 c 0,-0.504 0.411,-0.914 0.917,-0.914 0.505,0 0.915,0.41 0.915,0.914 l -0.003,0.487 C -0.746,-2.089 0,-1.205 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="M7 21.263c0 3.964 4.596 9 11 9s11-5 11-9c0 0-10.333 2.756-22 0z"/><path fill="#5D9040" d="M12 23.003v6.961c0 3 2 6 6 6s6-3 6-6v-6.92c-6.291 1.292-12-.041-12-.041z"/><path d="M12.284 12.33c-.756-.292-1.471-.568-1.471-.968 0-.659.884-.693 1.061-.693.625 0 .936.234 1.21.441.21.159.428.323.731.323.564 0 .821-.397.821-.766 0-.736-.902-1.256-1.858-1.474V8.8c0-.518-.421-.939-.939-.939s-.939.421-.939.939v.426c-1.144.333-1.845 1.174-1.845 2.235 0 1.311 1.293 1.849 2.434 2.323.817.34 1.589.661 1.589 1.162 0 .366-.46.762-1.203.762-.75 0-1.18-.3-1.56-.564-.262-.183-.51-.356-.806-.356-.43 0-.766.362-.766.824 0 .679.931 1.356 2.157 1.594v.47c0 .518.421.938.939.938s.939-.421.939-.938l-.005-.498c1.296-.315 2.062-1.222 2.062-2.459.001-1.404-1.414-1.95-2.551-2.389zm14.41 2.406c0-1.404-1.415-1.95-2.552-2.389-.756-.292-1.47-.568-1.47-.968 0-.659.884-.693 1.061-.693.625 0 .935.234 1.21.441.211.159.428.323.73.323.565 0 .822-.397.822-.766 0-.737-.902-1.256-1.858-1.474v-.392c0-.518-.422-.939-.939-.939-.518 0-.94.421-.94.939v.426c-1.143.333-1.845 1.174-1.845 2.235 0 1.311 1.293 1.849 2.434 2.323.817.34 1.589.661 1.589 1.162 0 .366-.459.762-1.202.762-.75 0-1.18-.3-1.559-.564-.263-.183-.511-.356-.806-.356-.431 0-.767.362-.767.824 0 .679.931 1.356 2.156 1.594v.47c0 .517.423.938.941.938s.938-.421.938-.938l-.003-.498c1.295-.317 2.06-1.223 2.06-2.46z" fill="#664500"/><path fill="#FFF" d="M20.97 31.069c0-1.368-1.379-1.901-2.487-2.329-.737-.284-1.434-.554-1.434-.943 0-.643.861-.675 1.034-.675.609 0 .912.229 1.18.43.205.155.418.315.713.315.55 0 .801-.388.801-.747 0-.717-.879-1.224-1.812-1.437V25.3c0-.505-.411-.916-.916-.916s-.916.411-.916.916v.415c-1.115.324-1.799 1.145-1.799 2.179 0 1.278 1.261 1.803 2.373 2.265.797.331 1.549.644 1.549 1.132 0 .357-.448.743-1.173.743-.731 0-1.15-.292-1.52-.551-.255-.178-.497-.347-.785-.347-.419 0-.748.354-.748.804 0 .663.907 1.322 2.102 1.554v.459c0 .504.411.914.917.914.505 0 .915-.41.915-.914l-.003-.486c1.263-.309 2.009-1.193 2.009-2.398z"/></svg> \ No newline at end of file |