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/1f233.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/1f233.svg')
| -rw-r--r-- | public/emoji/1f233.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f233.svg b/public/emoji/1f233.svg index c9de76080..2e2072ce9 100644 --- a/public/emoji/1f233.svg +++ b/public/emoji/1f233.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:#226699;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.8857,26.748)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.534,0 2.288,-0.676 2.288,-2.158 l 0,-1.612 c 0,-0.494 -0.364,-0.729 -0.962,-0.729 -0.597,0 -0.988,0.235 -0.988,0.729 l 0,1.196 c 0,0.572 -0.312,0.754 -0.832,0.754 l -5.277,0 0,-4.498 c 0,-0.832 0.128,-0.936 2.625,-0.936 2.08,0 2.34,0.156 2.652,0.467 0.183,0.183 0.234,0.624 0.26,1.171 0.052,0.416 0.339,0.598 0.78,0.598 0.078,0 0.156,0 0.261,-0.026 0.597,-0.052 0.91,-0.364 0.91,-0.832 l 0,-0.13 C 1.639,-6.917 1.431,-7.749 1.092,-8.112 0.624,-8.632 -0.052,-8.997 -2.781,-9.022 l -0.547,0 c -1.586,0 -2.704,0.104 -3.406,0.363 -0.702,0.261 -0.989,0.755 -0.989,1.664 l 0,5.175 -3.041,0 c -0.208,-4.524 -2.808,-7.098 -7.93,-8.424 -0.13,-0.053 -0.235,-0.053 -0.338,-0.053 -0.443,0 -0.755,0.26 -0.859,0.729 -0.025,0.104 -0.051,0.234 -0.051,0.338 0,0.416 0.286,0.702 0.754,0.806 4.316,1.066 6.318,3.12 6.5,6.604 l -4.524,0 c -0.546,0 -0.832,-0.182 -0.832,-0.754 l 0,-2.184 c 0,-0.52 -0.416,-0.781 -1.015,-0.781 -0.597,0 -0.961,0.261 -0.961,0.781 l 0,2.6 c 0,1.482 0.753,2.158 2.288,2.158 l 7.722,0 0,2.288 c 0,0.494 0.364,0.728 0.988,0.728 0.624,0 0.988,-0.234 0.988,-0.728 L -8.034,0 0,0 Z m -17.42,-13.469 c -0.469,0 -0.754,0.338 -0.754,0.885 0,0.572 0.285,0.936 0.754,0.936 l 17.109,0 c 0.467,0 0.753,-0.364 0.753,-0.911 0,-0.546 -0.286,-0.91 -0.753,-0.91 l -7.671,0 0,-4.888 9.959,0 c 0.494,0 0.753,-0.364 0.753,-0.911 0,-0.545 -0.259,-0.935 -0.753,-0.935 l -21.711,0 c -0.469,0 -0.754,0.39 -0.754,0.935 0,0.573 0.285,0.911 0.754,0.911 l 9.698,0 0,4.888 -7.384,0 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#269" 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="M9.465 22.721c-.468 0-.754-.338-.754-.885 0-.572.286-.935.754-.935h17.109c.468 0 .754.363.754.91s-.286.91-.754.91h-7.67v4.889h9.959c.494 0 .754.363.754.91 0 .545-.26.936-.754.936H7.151c-.468 0-.754-.391-.754-.936 0-.572.286-.91.754-.91h9.698v-4.889H9.465zM26.886 9.252c1.534 0 2.288.676 2.288 2.158v1.612c0 .494-.364.728-.962.728s-.988-.234-.988-.728v-1.196c0-.572-.312-.754-.832-.754h-5.277v4.498c0 .832.129.936 2.625.936 2.08 0 2.341-.156 2.652-.468.183-.182.234-.624.26-1.17.053-.416.339-.598.78-.598.078 0 .156 0 .261.026.598.052.91.364.91.832v.13c-.078.91-.286 1.742-.625 2.106-.468.52-1.144.884-3.873.91h-.547c-1.586 0-2.704-.104-3.406-.364-.701-.26-.988-.754-.988-1.664v-5.174h-3.042c-.208 4.524-2.808 7.098-7.93 8.424-.13.053-.234.053-.338.053-.442 0-.754-.26-.858-.729-.026-.104-.052-.234-.052-.338 0-.416.286-.702.754-.806 4.316-1.066 6.318-3.12 6.5-6.604H9.673c-.546 0-.832.182-.832.754v2.184c0 .52-.416.78-1.014.78-.598 0-.962-.26-.962-.78v-2.6c0-1.482.754-2.158 2.288-2.158h7.722V6.964c0-.494.364-.728.988-.728s.988.234.988.728v2.288h8.035z"/></svg> \ No newline at end of file |
