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/1f1ea-1f1fa.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/1f1ea-1f1fa.svg')
-rw-r--r-- | public/emoji/1f1ea-1f1fa.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ea-1f1fa.svg b/public/emoji/1f1ea-1f1fa.svg index 76f6485a8..045024a33 100644 --- a/public/emoji/1f1ea-1f1fa.svg +++ b/public/emoji/1f1ea-1f1fa.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 4,31 C 1.791,31 0,29.21 0,27 L 0,27 0,9 C 0,6.79 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.79 4,4 l 0,0 0,18 c 0,2.21 -1.791,4 -4,4 l 0,0 -28,0 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"><path id="path20" style="fill:#003399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,31 36,31 36,5 0,5 0,31 Z"/><g transform="translate(18.5392,26.2955)" id="g22"><path id="path24" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(18.5392,8.9622)" id="g26"><path id="path28" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(9.8725,17.6288)" id="g30"><path id="path32" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(10.9799,21.914)" id="g34"><path id="path36" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(10.9799,13.2955)" id="g38"><path id="path40" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(14.2058,25.1344)" id="g42"><path id="path44" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(14.2058,10.0667)" id="g46"><path id="path48" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.849,0.617 -1.049,0 -0.325,0.998 -0.324,-0.998 -1.049,0 L -1.049,0 -1.374,-0.998 -0.525,-0.381 0.324,-0.998 0,0 Z"/></g><g transform="translate(26.1275,17.6288)" id="g50"><path id="path52" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.849,0.617 1.049,0 0.325,0.998 0.324,-0.998 1.049,0 L 1.049,0 1.374,-0.998 0.525,-0.381 -0.324,-0.998 0,0 Z"/></g><g transform="translate(25.0201,21.914)" id="g54"><path id="path56" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.849,0.617 1.049,0 0.325,0.998 0.324,-0.998 1.049,0 L 1.049,0 1.374,-0.998 0.525,-0.381 -0.324,-0.998 0,0 Z"/></g><g transform="translate(25.0201,13.2955)" id="g58"><path id="path60" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.849,0.617 1.049,0 0.325,0.998 0.324,-0.998 1.049,0 L 1.049,0 1.374,-0.998 0.525,-0.381 -0.324,-0.998 0,0 Z"/></g><g transform="translate(21.7942,25.1344)" id="g62"><path id="path64" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.849,0.617 1.049,0 0.325,0.998 0.324,-0.998 1.049,0 L 1.049,0 1.374,-0.998 0.525,-0.381 -0.324,-0.998 0,0 Z"/></g><g transform="translate(21.7942,10.0667)" id="g66"><path id="path68" style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.849,0.617 1.049,0 0.325,0.998 0.324,-0.998 1.049,0 L 1.049,0 1.374,-0.998 0.525,-0.381 -0.324,-0.998 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#039" d="M32 5H4C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4V9c0-2.209-1.791-4-4-4z"/><path d="M18.539 9.705l.849-.617h-1.049l-.325-.998-.324.998h-1.049l.849.617-.325.998.849-.617.849.617zm0 17.333l.849-.617h-1.049l-.325-.998-.324.998h-1.049l.849.617-.325.998.849-.617.849.617zm-8.666-8.667l.849-.617h-1.05l-.324-.998-.325.998H7.974l.849.617-.324.998.849-.617.849.617zm1.107-4.285l.849-.617h-1.05l-.324-.998-.324.998h-1.05l.849.617-.324.998.849-.617.849.617zm0 8.619l.849-.617h-1.05l-.324-.998-.324.998h-1.05l.849.617-.324.998.849-.617.849.617zm3.226-11.839l.849-.617h-1.05l-.324-.998-.324.998h-1.05l.849.617-.324.998.849-.617.849.617zm0 15.067l.849-.617h-1.05l-.324-.998-.324.998h-1.05l.849.617-.324.998.849-.616.849.616zm11.921-7.562l-.849-.617h1.05l.324-.998.325.998h1.049l-.849.617.324.998-.849-.617-.849.617zm-1.107-4.285l-.849-.617h1.05l.324-.998.324.998h1.05l-.849.617.324.998-.849-.617-.849.617zm0 8.619l-.849-.617h1.05l.324-.998.324.998h1.05l-.849.617.324.998-.849-.617-.849.617zm-3.226-11.839l-.849-.617h1.05l.324-.998.324.998h1.05l-.849.617.324.998-.849-.617-.849.617zm0 15.067l-.849-.617h1.05l.324-.998.324.998h1.05l-.849.617.324.998-.849-.616-.849.616z" fill="#FC0"/></svg> \ No newline at end of file |