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/2695.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/2695.svg')
-rw-r--r-- | public/emoji/2695.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/2695.svg b/public/emoji/2695.svg index 636f7ed26..add4c0e78 100644 --- a/public/emoji/2695.svg +++ b/public/emoji/2695.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(20.5,31.5)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.381 -1.119,-2.5 -2.5,-2.5 -3.881,-2.5 -5,-1.381 -5,0 -5,1.381 -3.881,2.5 -2.5,2.5 -1.119,2.5 0,1.381 0,0"/></g><g transform="translate(17.4716,17.7302)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.113,0.217 9.593,0.668 9.593,3.598 0,2.992 -6.342,3.215 -9.05,3.309 L 0.238,6.918 c -10.314,0.435 -8.543,2.903 -7.568,2.903 0.273,-0.246 1.189,-0.95 2.71,-0.95 0.522,0 1.066,0.085 1.62,0.252 0.097,0.029 0.165,0.111 0.169,0.205 0.004,0.094 -0.055,0.181 -0.149,0.219 l -1.461,0.576 2.272,0.449 c 0.08,0.016 0.146,0.067 0.177,0.138 0.03,0.071 0.02,0.15 -0.026,0.212 -0.052,0.068 -1.269,1.803 -3.355,1.803 -2.849,0 -5.14,-1.482 -5.14,-4.039 0,-3.089 7.321,-3.956 10.597,-3.956 6.272,0 6.59,-0.839 6.59,-1.007 0,-0.886 -2.227,-1.418 -6.62,-1.585 -4.692,-0.177 -7.725,-1.5 -7.725,-3.371 0,-1.762 2.272,-2.811 7.598,-3.508 2.424,-0.317 5.314,-0.85 5.314,-1.587 -10e-4,-0.01 -0.255,-0.983 -5.231,-1.606 -4.649,-0.583 -5.245,-1.677 -5.245,-2.564 0,-1.202 1.697,-2.022 5.34,-2.583 2.779,-0.427 3.558,-1.417 3.932,-1.893 0.158,-0.2 0.283,-0.359 0.499,-0.359 0.02,0 0.07,0.006 0.089,0.011 0.207,0.047 0.321,0.268 0.306,0.589 -0.01,0.24 -0.229,2.357 -4.52,3.005 -2.677,0.404 -2.885,1.048 -2.885,1.236 0,0.095 0.12,0.58 2.456,0.907 0.324,0.024 7.959,0.627 7.959,3.32 0,2.216 -4.462,3.023 -8.397,3.733 -1.984,0.359 -4.453,0.805 -4.453,1.274 0,0.418 0.852,0.976 4.909,1.258"/></g><g transform="translate(13.0662,29.0996)" id="g32"><path id="path34" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.244 -0.34,-0.442 -0.76,-0.442 -0.419,0 -0.759,0.198 -0.759,0.442 0,0.244 0.34,0.442 0.759,0.442 C -0.34,0.442 0,0.244 0,0"/></g><path id="path36" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,11.394 1,0 0,-3.872 -1,0 0,3.872 z"/><path id="path38" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,11.394 1,0 0,-3.872 -1,0 0,3.872 z"/><path id="path40" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,20.925 1,0 0,-3.872 -1,0 0,3.872 z"/><path id="path42" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,20.925 1,0 0,-3.872 -1,0 0,3.872 z"/><g transform="translate(17,16.1899)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2,-0.379 2,8.163 C 1.618,8.178 0.739,8.214 0,8.247 L 0,0 Z"/></g><g transform="translate(19,14.2112)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0.369 0,-7.457 c 0.538,-0.066 1.438,-0.277 2,-0.418 L 0,0 Z"/></g><g transform="translate(17,5.6647)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2.665 c 0,-0.552 0.447,-1 1,-1 0.553,0 1,0.448 1,1 l 0,2.257 C 1.132,-0.209 0.578,-0.129 0,0"/></g><g transform="translate(19,25.5621)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,5.108 c 0,0.553 -0.447,1 -1,1 -0.553,0 -1,-0.447 -1,-1 L -2,0.092 0,0 Z"/></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"/><circle fill="#FFF" cx="18" cy="4.5" r="2.5"/><path fill="#FFF" d="M17.472 18.27c3.113-.217 9.593-.668 9.593-3.598 0-2.993-6.341-3.215-9.049-3.31l-.305-.011c-10.314-.435-8.543-2.903-7.569-2.903.274.246 1.189.95 2.71.95.522 0 1.067-.084 1.62-.251.097-.029.165-.111.169-.205.004-.094-.055-.181-.149-.219l-1.461-.577 2.272-.449c.08-.016.146-.067.176-.137.03-.071.02-.151-.025-.212-.052-.068-1.269-1.803-3.355-1.803-2.849 0-5.141 1.483-5.141 4.039 0 3.09 7.322 3.957 10.597 3.957 6.272 0 6.59.839 6.59 1.007 0 .885-2.227 1.418-6.62 1.585-4.692.178-7.724 1.501-7.724 3.371 0 1.762 2.272 2.811 7.598 3.508 2.424.317 5.314.85 5.314 1.587-.001.009-.255.983-5.231 1.605-4.649.583-5.246 1.677-5.246 2.564 0 1.201 1.697 2.022 5.341 2.582 2.779.427 3.558 1.417 3.932 1.893.158.2.283.359.499.359.02 0 .07-.006.089-.01.207-.048.321-.268.306-.59-.01-.239-.229-2.357-4.521-3.005-2.677-.404-2.884-1.048-2.884-1.236 0-.094.12-.58 2.455-.907.324-.024 7.96-.626 7.96-3.32 0-2.216-4.462-3.023-8.398-3.733-1.984-.359-4.453-.805-4.453-1.273.001-.418.852-.976 4.91-1.258z"/><ellipse fill="#9266CC" cx="12.307" cy="6.9" rx=".76" ry=".442"/><path fill="#9266CC" d="M16 24.606h1v3.872h-1zm3 0h1v3.872h-1zm-3-9.531h1v3.872h-1zm3 0h1v3.872h-1z"/><path d="M17 19.81l2 .379v-8.541l-2-.084v8.246zm2 1.979l-2-.369v7.457c.538.065 1.438.277 2 .418v-7.506zm-2 8.546V33c0 .553.447 1 1 1s1-.447 1-1v-2.257c-.868-.199-1.422-.278-2-.408zm2-19.897V5.33c0-.553-.447-1-1-1s-1 .447-1 1v5.016l2 .092z" fill="#FFF"/></svg> \ No newline at end of file |