about summary refs log tree commit diff
path: root/public/emoji/1f1e8-1f1f0.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 07:05:29 +0200
committerThibaut Girka <thib@sitedethib.com>2018-07-09 07:13:59 +0200
commitd392020da6ff4511a2925b327de23933f374bea3 (patch)
treee86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f1e8-1f1f0.svg
parentc699b2d141d7aa910bd81ae5fe881ecec7039395 (diff)
parent1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (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/1f1e8-1f1f0.svg')
-rw-r--r--public/emoji/1f1e8-1f1f0.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1e8-1f1f0.svg b/public/emoji/1f1e8-1f1f0.svg
index bec3a0836..04e034448 100644
--- a/public/emoji/1f1e8-1f1f0.svg
+++ b/public/emoji/1f1e8-1f1f0.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><clipPath id="clipPath56" clipPathUnits="userSpaceOnUse"><path id="path58" d="M 4,31 C 1.791,31 0,29.209 0,27 l 0,0 0,-9 19,0 0,13 -15,0 z"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" 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,9)" id="g20"><path id="path22" style="fill:#00247d;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,18 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(19,31)" id="g24"><path id="path26" style="fill:#00247d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -15,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-9 19,0 0,13 z"/></g><g transform="translate(19,18)" id="g28"><path id="path30" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2.029 -7.1,7 -12.329,7 -2.332,0 0,0 Z"/></g><g transform="translate(19,19.418)" id="g32"><path id="path34" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.971,5.582 -1.743,0 L 0,-1.22 0,0 Z"/></g><g transform="translate(8.0996,25)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -8.1,-5.766 -8.1,-7 -4.768,-7 5.23,0 0,0 Z"/></g><g transform="translate(10.7139,25)" id="g40"><path id="path42" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.98,-7 0.266,0 1.461,0 L 1.744,0 0,0 Z"/></g><g transform="translate(16.6689,31)" id="g44"><path id="path46" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.997,-7 5.229,0 7.099,4.971 L 2.331,0 0,0 Z"/></g><g transform="translate(17.5391,31)" id="g48"><path id="path50" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -9.996,-7 1.743,0 9.714,6.802 L 1.461,0 0,0 Z"/></g></g></g><g id="g52"><g clip-path="url(#clipPath56)" id="g54"><g transform="translate(10,24)" id="g60"><path id="path62" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.328,0 -6.668,7 -9,7 -9.625,5.406 0,-1.331 0,0 Z"/></g><g transform="translate(10,24)" id="g64"><path id="path66" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.714,0 -9,6.802 -9.5,5.937 0,-0.722 0,0 Z"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(19,27)" id="g76"><path id="path78" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7,0 0,4 -5,0 0,-4 -7,0 0,-5 7,0 0,-4 5,0 0,4 7,0 0,5 z"/></g><path id="path80" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 11,18 -3,0 0,13 3,0 0,-13 z"/><path id="path82" style="fill:#cf1b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 19,23 -19,0 0,3 19,0 0,-3 z"/><g transform="translate(27.8031,24.2171)" id="g84"><path id="path86" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.812,0.59 -1.004,0 -0.31,0.954 -0.31,-0.954 -1.004,0 0.812,-0.59 -0.31,-0.955 0.812,0.59 L 0.31,-0.955 0,0 Z"/></g><g transform="translate(30.365,23.476)" id="g88"><path id="path90" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.982,0.208 0.065,0.617 0.17,1.615 -0.502,0.869 -1.418,1.278 -0.917,0.408 -1.589,-0.337 -0.607,-0.129 -0.105,-0.998 0,0 Z"/></g><g transform="translate(32.4155,21.7142)" id="g92"><path id="path94" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.982,-0.207 0.309,0.538 0.809,1.408 -0.107,0.998 -0.78,1.742 -0.673,0.744 -1.589,0.334 -0.607,0.128 -0.5,-0.87 0,0 Z"/></g><g transform="translate(33.5595,19.3143)" id="g96"><path id="path98" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.815,-0.586 0.5,0.367 1.309,0.962 0.305,0.956 -0.01,1.909 -0.315,0.953 -1.319,0.948 -0.504,0.362 -0.809,-0.594 0,0 Z"/></g><g transform="translate(33.6397,16.6244)" id="g100"><path id="path102" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.503,-0.868 0.607,0.13 1.588,0.34 0.67,0.747 0.774,1.745 0.103,0.998 -0.814,1.405 -0.311,0.537 -0.981,-0.21 0,0 Z"/></g><g transform="translate(32.6023,14.1784)" id="g104"><path id="path106" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.104,-0.998 0.607,-0.129 1.588,-0.338 0.917,0.408 1.419,1.277 0.502,0.869 -0.169,1.615 -0.065,0.617 -0.982,0.209 0,0 Z"/></g><g transform="translate(30.6641,12.2978)" id="g108"><path id="path110" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.306,-0.956 0.503,-0.363 1.318,-0.949 1.004,0.004 1.813,0.597 0.81,0.593 0.496,1.546 0.189,0.591 -0.814,0.587 0,0 Z"/></g><g transform="translate(28.1435,11.4192)" id="g112"><path id="path114" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.669,-0.748 0.981,0.212 0.505,-0.867 0.101,0.998 0.981,0.213 L 0.981,0.212 1.082,1.211 0.413,0.463 -0.505,0.867 0,0 Z"/></g><g transform="translate(24.2377,23.476)" id="g116"><path id="path118" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.982,0.208 -0.065,0.617 -0.17,1.615 0.502,0.869 1.418,1.278 0.917,0.408 1.589,-0.337 0.607,-0.129 0.105,-0.998 0,0 Z"/></g><g transform="translate(22.1872,21.7142)" id="g120"><path id="path122" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.982,-0.207 0.673,0.745 -0.5,0.87 L 0.107,0.998 0.78,1.742 0.673,0.744 1.589,0.334 0.607,0.128 0.5,-0.87 0,0 Z"/></g><g transform="translate(21.0431,19.3143)" id="g124"><path id="path126" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.815,-0.586 -0.5,0.367 -1.309,0.962 -0.305,0.956 0.01,1.909 0.315,0.953 1.319,0.948 0.504,0.362 0.809,-0.594 0,0 Z"/></g><g transform="translate(20.9629,16.6244)" id="g128"><path id="path130" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.503,-0.868 -0.607,0.13 -1.588,0.34 -0.67,0.747 -0.774,1.745 -0.103,0.998 0.814,1.405 0.311,0.537 0.981,-0.21 0,0 Z"/></g><g transform="translate(22.0004,14.1784)" id="g132"><path id="path134" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.104,-0.998 -0.607,-0.129 -1.588,-0.338 -0.917,0.408 -1.419,1.277 -0.502,0.869 0.169,1.615 0.065,0.617 0.982,0.209 0,0 Z"/></g><g transform="translate(23.9385,12.2978)" id="g136"><path id="path138" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.306,-0.956 -0.503,-0.363 -1.318,-0.949 -1.004,0.004 -1.813,0.597 -0.81,0.593 -0.496,1.546 -0.189,0.591 0.814,0.587 0,0 Z"/></g><g transform="translate(26.4591,11.4192)" id="g140"><path id="path142" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.669,-0.748 -0.981,0.212 -0.505,-0.867 -0.101,0.998 -0.981,0.213 0.918,0.404 L -1.082,1.211 -0.413,0.463 0.505,0.867 0,0 Z"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#00247D" d="M32 5H4c-.205 0-.407.015-.604.045l-.004 1.754-2.73-.004C.244 7.427 0 8.185 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="M27.803 11.783l.812-.59h-1.004l-.31-.955-.31.955h-1.004l.812.59-.31.954.812-.589.812.589zm2.562.741l.982-.208-.917-.409.105-.998-.672.746-.916-.409.501.87-.672.745.982-.208.502.869zm2.05 1.762l.983.206-.674-.744.5-.87-.916.41-.673-.745.107.998-.916.411.982.206.107.998zm1.144 2.4l.816.585-.316-.953.809-.594-1.003.006-.316-.953-.305.956-1.003.005.815.586-.305.956zm.081 2.69l.503.868.103-.998.982-.211-.918-.406.103-.999-.67.747-.918-.406.504.868-.671.747zm-1.038 2.446l.105.998.502-.869.982.209-.672-.746.503-.869-.917.408-.672-.747.105.999-.917.407zm-1.938 1.88l-.306.956.809-.593.815.587-.314-.954.809-.593-1.003.004-.314-.953-.307.956-1.003.004zm-2.52.879l-.669.748.981-.212.505.867.101-.998.981-.213-.919-.405.102-.998-.669.748-.919-.405zm-3.906-12.057l-.982-.208.917-.409-.105-.998.671.746.917-.409-.502.87.672.745-.982-.208-.501.869zm-2.051 1.762l-.982.206.673-.744-.5-.87.916.41.673-.745-.107.998.916.411-.982.206-.107.998zm-1.144 2.4l-.815.585.315-.953-.809-.594 1.004.006.315-.953.305.956 1.004.005-.815.586.305.956zm-.08 2.69l-.503.868-.104-.998-.981-.211.918-.406-.104-.999.671.747.917-.406-.503.868.67.747zM22 21.822l-.104.998-.502-.869-.982.209.671-.746-.502-.869.917.408.671-.747-.104.999.917.407zm1.939 1.88l.306.956-.81-.593-.814.587.314-.954-.81-.593 1.004.004.314-.953.306.956 1.004.004zm2.52.879l.669.748-.981-.212-.505.867-.101-.998-.981-.213.918-.405-.101-.998.669.748.918-.405z" fill="#FFF"/><path fill="#00247D" d="M19 18V5H4c-.32 0-.604.045-.604.045l-.004 1.754-2.73-.004S.62 6.854.535 7C.195 7.589 0 8.272 0 9v9h19z"/><path fill="#EEE" d="M19 5h-2.331L12 8.269V5H7v2.569L3.396 5.045c-.614.094-1.19.325-1.672.665L6.426 9H4.69L.967 6.391c-.11.129-.211.262-.305.404L3.813 9H0v5h3.885L0 16.766V18h3.332L7 15.432V18h5v-3.269L16.668 18H19v-2.029L16.185 14H19V9h-2.814L19 7.029V5z"/><path fill="#CF1B2B" d="M11 5H8v5H0v3h8v5h3v-5h8v-3h-8z"/><path fill="#CF1B2B" d="M19 5h-1.461L12 8.879V9h1.571L19 5.198zm-17.276.71c-.281.195-.534.423-.757.681L4.69 9h1.735L1.724 5.71zM6.437 14L.734 18h1.727L7 14.822V14zM19 17.802v-1.22L15.313 14H13.57z"/></svg>
\ No newline at end of file