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/1f384.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/1f384.svg')
-rw-r--r-- | public/emoji/1f384.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f384.svg b/public/emoji/1f384.svg index d8f76bc7f..6e9b11e27 100644 --- a/public/emoji/1f384.svg +++ b/public/emoji/1f384.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(22.0879,3.1699)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.997 -1.619,-2.712 -3.616,-2.712 -1.997,0 -3.616,0.715 -3.616,2.712 l 0.904,8.136 c 0,1.996 0.715,1.807 2.712,1.807 1.997,0 2.712,0.189 2.712,-1.807 L 0,0 Z"/></g><g transform="translate(30.5898,8.3252)" id="g24"><path id="path26" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -6.294,5.392 -8.843,13.112 -12.118,13.112 -3.275,0 -5.824,-7.72 -12.118,-13.112 -2.644,-2.266 -1.385,-3.577 2.241,-3.314 3.232,0.232 6.255,0.965 9.877,0.965 3.622,0 6.645,-0.733 9.876,-0.965 C 1.385,-3.577 2.645,-2.266 0,0"/></g><g transform="translate(28.5459,10.4619)" id="g28"><path id="path30" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.837,4.435 -7.555,10.787 -10.074,10.787 -2.517,0 -5.237,-6.352 -10.073,-10.787 -3.844,-3.524 5.037,-4.315 10.073,0 C -5.04,-4.315 3.843,-3.524 0,0"/></g><g transform="translate(28.5459,14.0547)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.837,4.143 -7.555,10.077 -10.074,10.077 -2.517,0 -5.237,-5.934 -10.073,-10.077 -3.844,-3.292 5.037,-4.031 10.073,0 C -5.04,-4.031 3.843,-3.292 0,0"/></g><g transform="translate(26.3359,16.9971)" id="g36"><path id="path38" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.775,3.235 -5.897,7.868 -7.864,7.868 -1.966,0 -4.089,-4.633 -7.865,-7.868 -3,-2.57 3.933,-3.146 7.865,0 C -3.934,-3.146 3.001,-2.57 0,0"/></g><g transform="translate(26.3359,19.689)" id="g40"><path id="path42" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.775,3.235 -5.897,7.867 -7.864,7.867 -1.966,0 -4.089,-4.632 -7.865,-7.867 -3,-2.571 3.933,-3.147 7.865,0 C -3.934,-3.147 3.001,-2.571 0,0"/></g><g transform="translate(24.8184,22.0796)" id="g44"><path id="path46" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.047,2.61 -4.76,6.349 -6.347,6.349 -7.933,6.349 -9.646,2.61 -12.694,0 -15.116,-2.075 -9.52,-2.54 -6.347,0 -3.174,-2.54 2.423,-2.075 0,0"/></g><g transform="translate(24.8184,24.106)" id="g48"><path id="path50" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -3.047,2.61 -4.76,6.349 -6.347,6.349 -7.933,6.349 -9.646,2.61 -12.694,0 -15.116,-2.075 -9.52,-2.54 -6.347,0 -3.174,-2.54 2.423,-2.075 0,0"/></g><g transform="translate(23.3008,27.0889)" id="g52"><path id="path54" style="fill:#3e721d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.317,1.986 -3.621,4.831 -4.829,4.831 -6.036,4.831 -7.34,1.986 -9.659,0 -11.501,-1.579 -7.244,-1.933 -4.829,0 -2.415,-1.933 1.844,-1.579 0,0"/></g><g transform="translate(23.3008,28.1685)" id="g56"><path id="path58" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.317,1.986 -3.621,4.832 -4.829,4.832 -6.036,4.832 -7.34,1.986 -9.659,0 -11.501,-1.579 -7.244,-1.933 -4.829,0 -2.415,-1.933 1.844,-1.579 0,0"/></g><g transform="translate(18,23.958)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.829 -0.671,-1.5 -1.5,-1.5 -2.329,-1.5 -3,-0.829 -3,0 -3,0.829 -2.329,1.5 -1.5,1.5 -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(22,11)" id="g64"><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.105,0 2,-0.895 2,-2"/></g><g transform="translate(25,20.5)" id="g68"><path id="path70" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.12,-2.5 -2.5,-2.5 -3.88,-2.5 -5,-1.381 -5,0 -5,1.381 -3.88,2.5 -2.5,2.5 -1.12,2.5 0,1.381 0,0"/></g><g transform="translate(12,10)" id="g72"><path id="path74" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(16,17)" id="g76"><path id="path78" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(28,13)" id="g80"><path id="path82" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,1.105 0.896,2 2,2 1.104,0 2,-0.895 2,-2"/></g><g transform="translate(19.3789,34.3213)" id="g84"><path id="path86" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.143,-0.275 0.512,-0.549 0.817,-0.609 L 2.196,-0.878 C 2.501,-0.937 2.573,-1.168 2.355,-1.39 L 1.372,-2.395 C 1.155,-2.617 1.007,-3.051 1.046,-3.36 l 0.17,-1.394 C 1.254,-5.062 1.057,-5.202 0.777,-5.064 l -1.257,0.625 c -0.279,0.138 -0.738,0.144 -1.02,0.012 l -1.273,-0.594 c -0.283,-0.13 -0.476,0.014 -0.431,0.322 l 0.205,1.39 c 0.046,0.307 -0.09,0.745 -0.302,0.973 l -0.958,1.028 c -0.212,0.227 -0.135,0.457 0.172,0.509 l 1.385,0.234 c 0.307,0.051 0.681,0.316 0.832,0.588 l 0.681,1.229 c 0.152,0.272 0.394,0.269 0.538,-0.006 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M22.088 32.83c0 1.997-1.619 2.712-3.616 2.712s-3.616-.715-3.616-2.712l.904-8.136c0-1.996.715-1.808 2.712-1.808 1.997 0 2.712-.188 2.712 1.808l.904 8.136z"/><path fill="#5C913B" d="M30.59 27.675c-6.294-5.392-8.843-13.112-12.118-13.112s-5.824 7.721-12.118 13.112c-2.645 2.266-1.385 3.577 2.241 3.314 3.232-.233 6.255-.966 9.877-.966s6.646.733 9.876.966c3.627.263 4.886-1.049 2.242-3.314z"/><path fill="#3E721D" d="M28.546 25.538c-4.837-4.435-7.555-10.787-10.074-10.787-2.517 0-5.236 6.352-10.073 10.787-3.844 3.524 5.037 4.315 10.073 0 5.034 4.316 13.917 3.524 10.074 0z"/><path fill="#5C913B" d="M28.546 21.945c-4.837-4.143-7.555-10.077-10.074-10.077-2.517 0-5.236 5.934-10.073 10.077-3.844 3.292 5.037 4.031 10.073 0 5.034 4.032 13.917 3.292 10.074 0z"/><path fill="#3E721D" d="M26.336 19.003c-3.775-3.235-5.897-7.868-7.864-7.868-1.965 0-4.088 4.632-7.864 7.868-3 2.57 3.932 3.147 7.864 0 3.93 3.146 10.865 2.57 7.864 0z"/><path fill="#5C913B" d="M26.336 16.311c-3.775-3.235-5.897-7.867-7.864-7.867-1.965 0-4.088 4.632-7.864 7.867-3 2.571 3.932 3.147 7.864 0 3.93 3.147 10.865 2.571 7.864 0z"/><path fill="#3E721D" d="M24.818 13.92c-3.047-2.61-4.76-6.349-6.347-6.349-1.586 0-3.299 3.739-6.347 6.349-2.422 2.075 3.174 2.54 6.347 0 3.174 2.54 8.77 2.075 6.347 0z"/><path fill="#5C913B" d="M24.818 11.894c-3.047-2.61-4.76-6.349-6.347-6.349-1.586 0-3.299 3.739-6.347 6.349-2.422 2.075 3.174 2.54 6.347 0 3.174 2.54 8.77 2.075 6.347 0z"/><path fill="#3E721D" d="M23.301 8.911C20.983 6.925 19.68 4.08 18.472 4.08c-1.207 0-2.511 2.845-4.83 4.831-1.843 1.579 2.415 1.933 4.83 0 2.414 1.933 6.673 1.579 4.829 0z"/><path fill="#5C913B" d="M23.301 7.832C20.983 5.845 19.68 3 18.472 3c-1.207 0-2.511 2.845-4.83 4.832-1.843 1.579 2.415 1.933 4.83 0 2.414 1.932 6.673 1.578 4.829 0z"/><circle fill="#FFCC4D" cx="16.5" cy="12.042" r="1.5"/><circle fill="#FFCC4D" cx="20" cy="25" r="2"/><circle fill="#DD2E44" cx="22.5" cy="15.5" r="2.5"/><circle fill="#DD2E44" cx="10" cy="26" r="2"/><circle fill="#A6D388" cx="14" cy="19" r="2"/><circle fill="#A6D388" cx="26" cy="23" r="2"/><path fill="#FFAC33" d="M19.379 1.679c.143.275.512.549.817.609l1.379.269c.305.06.377.29.159.512l-.983 1.004c-.217.222-.365.657-.326.965l.17 1.394c.038.309-.159.448-.438.31L18.9 6.117c-.279-.138-.738-.144-1.02-.013l-1.274.594c-.282.13-.476-.014-.43-.322l.205-1.39c.045-.307-.091-.745-.302-.973l-.959-1.027c-.212-.227-.135-.457.172-.508l1.385-.234c.307-.051.681-.316.832-.588L18.19.427c.151-.272.394-.269.537.006l.652 1.246z"/></svg> \ No newline at end of file |