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/2638.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/2638.svg')
-rw-r--r-- | public/emoji/2638.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2638.svg b/public/emoji/2638.svg index c65083aad..a00bf1d40 100644 --- a/public/emoji/2638.svg +++ b/public/emoji/2638.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,4)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,28 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g><g transform="translate(26.4474,10.9657)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.32,4.32 c 0.35,0.511 0.601,1.092 0.742,1.714 l 6.08,0 C 2.295,3.751 1.391,1.668 0,0 m -7.447,-3.915 0,6.15 c 0.612,0.125 1.178,0.37 1.687,0.697 l 4.346,-4.346 c -1.667,-1.39 -3.751,-2.294 -6.033,-2.501 m -2,0 c -2.283,0.207 -4.367,1.111 -6.034,2.501 l 4.345,4.346 c 0.509,-0.327 1.076,-0.572 1.689,-0.697 l 0,-6.15 z M -16.895,0 c -1.391,1.668 -2.295,3.751 -2.502,6.034 l 6.08,0 c 0.141,-0.622 0.392,-1.203 0.741,-1.714 L -16.895,0 Z m 0,14.068 4.245,-4.246 c -0.344,-0.536 -0.588,-1.139 -0.706,-1.788 l -6.041,0 c 0.207,2.283 1.111,4.366 2.502,6.034 m 7.448,3.915 0,-5.95 c -0.662,-0.135 -1.275,-0.402 -1.815,-0.771 l -4.219,4.22 c 1.667,1.39 3.751,2.294 6.034,2.501 m 4,-10.849 c 0,-1.654 -1.346,-3 -3,-3 -1.655,0 -3,1.346 -3,3 0,1.654 1.345,3 3,3 1.654,0 3,-1.346 3,-3 m -2,10.849 c 2.282,-0.207 4.366,-1.111 6.033,-2.501 l -4.22,-4.22 c -0.539,0.369 -1.152,0.636 -1.813,0.771 l 0,5.95 z M 0,14.068 C 1.391,12.4 2.295,10.317 2.502,8.034 l -6.04,0 C -3.657,8.683 -3.901,9.286 -4.245,9.822 L 0,14.068 Z m 5.553,-6.034 -1.051,0 c -0.217,2.833 -1.341,5.411 -3.088,7.447 l 1.159,1.159 c 0.391,0.391 0.391,1.024 0,1.414 -0.391,0.391 -1.023,0.391 -1.414,0 L 0,16.895 c -2.037,1.747 -4.615,2.871 -7.447,3.088 l 0,1.051 c 0,0.552 -0.448,1 -1,1 -0.553,0 -1,-0.448 -1,-1 l 0,-1.051 c -2.833,-0.217 -5.411,-1.341 -7.448,-3.088 l -1.066,1.066 c -0.39,0.391 -1.023,0.391 -1.414,0 -0.39,-0.391 -0.39,-1.023 0,-1.414 l 1.066,-1.066 c -1.747,-2.036 -2.871,-4.614 -3.088,-7.447 l -1.05,0 c -0.553,0 -1,-0.447 -1,-1 0,-0.552 0.447,-1 1,-1 l 1.05,0 c 0.217,-2.832 1.341,-5.411 3.088,-7.447 l -1.159,-1.159 c -0.391,-0.391 -0.391,-1.024 0,-1.414 0.195,-0.196 0.451,-0.293 0.707,-0.293 0.256,0 0.512,0.097 0.707,0.293 l 1.159,1.159 c 2.037,-1.747 4.615,-2.871 7.448,-3.088 l 0,-1.051 c 0,-0.552 0.447,-1 1,-1 0.552,0 1,0.448 1,1 l 0,1.051 c 2.832,0.217 5.41,1.341 7.446,3.087 l 1.066,-1.065 c 0.196,-0.196 0.451,-0.293 0.707,-0.293 0.256,0 0.512,0.097 0.707,0.293 0.391,0.39 0.391,1.023 0,1.414 l -1.066,1.066 c 1.748,2.036 2.872,4.615 3.089,7.447 l 1.051,0 c 0.552,0 1,0.448 1,1 0,0.553 -0.448,1 -1,1"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M32 17h-1.051c-.217-2.832-1.341-5.411-3.088-7.447l1.159-1.159c.391-.391.391-1.023 0-1.414s-1.023-.391-1.414 0l-1.159 1.159C24.411 6.392 21.833 5.268 19 5.051V4c0-.552-.447-1-1-1s-1 .448-1 1v1.051c-2.833.217-5.411 1.341-7.448 3.088L8.487 7.073c-.391-.391-1.023-.391-1.414 0s-.391 1.023 0 1.414l1.066 1.066C6.391 11.589 5.268 14.168 5.051 17H4c-.552 0-1 .447-1 1s.448 1 1 1h1.051c.217 2.833 1.341 5.411 3.088 7.447L6.98 27.606c-.391.391-.391 1.023 0 1.414.195.195.451.293.707.293s.512-.098.707-.293l1.159-1.159c2.036 1.747 4.615 2.871 7.447 3.088V32c0 .553.447 1 1 1s1-.447 1-1v-1.051c2.832-.217 5.41-1.341 7.447-3.088l1.066 1.066c.195.195.451.293.707.293s.512-.098.707-.293c.391-.391.391-1.023 0-1.414l-1.066-1.066c1.747-2.037 2.871-4.615 3.088-7.448H32c.553 0 1-.447 1-1S32.553 17 32 17zm-5.552-6.033c1.391 1.667 2.294 3.751 2.501 6.033h-6.04c-.119-.649-.363-1.252-.707-1.788l4.246-4.245zM19 7.051c2.283.207 4.366 1.111 6.034 2.501l-4.22 4.22c-.539-.369-1.152-.636-1.814-.771v-5.95zM21 17.9c0 1.654-1.346 3-3 3s-3-1.346-3-3 1.346-3 3-3 3 1.346 3 3zM17 7.051v5.95c-.662.135-1.275.402-1.814.771l-4.22-4.22c1.667-1.39 3.751-2.294 6.034-2.501zm-7.448 3.916l4.246 4.246c-.344.536-.588 1.139-.707 1.788h-6.04c.207-2.284 1.11-4.367 2.501-6.034zm0 14.067C8.161 23.366 7.258 21.283 7.051 19h6.08c.141.622.392 1.203.741 1.714l-4.32 4.32zM17 28.949c-2.283-.207-4.366-1.111-6.034-2.501l4.345-4.345c.509.327 1.076.572 1.688.697v6.149zm2 0v-6.15c.612-.125 1.179-.37 1.688-.697l4.345 4.346c-1.667 1.391-3.75 2.294-6.033 2.501zm7.447-3.915l-4.32-4.32c.35-.511.601-1.092.741-1.715h6.08c-.206 2.284-1.11 4.368-2.501 6.035z"/></svg> \ No newline at end of file |