about summary refs log tree commit diff
path: root/public/emoji/1f37b.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/1f37b.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/1f37b.svg')
-rw-r--r--public/emoji/1f37b.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f37b.svg b/public/emoji/1f37b.svg
index c4bd4c719..a8bcb20c6 100644
--- a/public/emoji/1f37b.svg
+++ b/public/emoji/1f37b.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="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 3.523,32 C 2.682,32 2,31.318 2,30.478 l 0,0 L 2,8 C 2,7.16 3.159,6 4,6 L 4,6 17.477,6 C 18.319,6 19,6.682 19,7.522 l 0,0 0,22.956 C 19,31.318 18.319,32 17.477,32 l 0,0 -13.954,0 z"/></clipPath><clipPath id="clipPath40" clipPathUnits="userSpaceOnUse"><path id="path42" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath68" clipPathUnits="userSpaceOnUse"><path id="path70" d="M 14.522,26 C 13.682,26 13,25.319 13,24.477 l 0,0 0,-22.954 C 13,0.681 13.682,0 14.522,0 l 0,0 13.956,0 C 29.318,0 30,0.681 30,1.523 l 0,0 0,22.954 C 30,25.319 29.318,26 28.478,26 l 0,0 -13.956,0 z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" 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(19,7.5225)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.841 -0.682,-1.523 -1.522,-1.523 l -13.478,0 c -1,0 -2,0.682 -2,1.856 l 0,22.955 c 0,0.508 0.682,1.189 1.522,1.189 l 13.956,0 C -0.682,24.477 0,23.796 0,22.955 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(17.5117,29.4316)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.021,0 -1.875,-0.673 -2.168,-1.597 -0.158,0.044 -0.324,0.075 -0.497,0.075 -0.446,0 -0.853,-0.161 -1.177,-0.418 -0.173,1.518 -1.446,2.702 -3.011,2.702 -1.502,0 -2.745,-1.092 -2.993,-2.524 -0.236,0.15 -0.513,0.24 -0.814,0.24 -0.379,0 -0.722,-0.145 -0.989,-0.374 -0.454,1.111 -1.542,1.896 -2.817,1.896 -1.682,0 -3.046,3.807 -3.046,-3.045 0,-1.682 1.364,-3.046 3.046,-3.046 1.275,0 2.363,0.785 2.817,1.897 0.267,-0.23 0.61,-0.374 0.989,-0.374 0.515,0 0.97,0.257 1.245,0.65 0.541,-0.847 1.483,-1.412 2.562,-1.412 0.991,0 1.863,0.481 2.418,1.213 0.278,-0.708 0.963,-1.213 1.77,-1.213 0.723,0 1.343,0.408 1.666,1.001 0.303,-0.149 0.639,-0.239 0.999,-0.239 1.262,0 2.284,1.023 2.284,2.284 C 2.284,1.523 1.262,0 0,0"/></g></g></g><g id="g36"><g clip-path="url(#clipPath40)" id="g38"><g transform="translate(11,9)" id="g44"><path id="path46" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,11 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(6,9)" id="g48"><path id="path50" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,11 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(20,31)" id="g52"><path id="path54" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2 -1,3 -3,3 l -14,0 c -2,0 -3,-1 -3,-3 l 0,-1.568 c 0,-0.073 0.012,-0.143 0.021,-0.213 -0.013,-0.387 -0.021,-0.818 -0.021,-1.31 0,-1.682 1.364,-3.045 3.045,-3.045 1.275,0 2.364,0.785 2.818,1.896 0.266,-0.23 0.61,-0.374 0.989,-0.374 0.515,0 0.969,0.258 1.245,0.65 0.541,-0.846 1.483,-1.411 2.562,-1.411 0.99,0 1.862,0.48 2.418,1.213 0.278,-0.709 0.963,-1.213 1.77,-1.213 0.722,0 1.342,0.407 1.666,1 0.302,-0.148 0.638,-0.239 0.999,-0.239 1.261,0 2.488,1.353 2.488,2.614 0,0.235 0.01,-0.196 0,0 0.004,0.039 0,0.392 0,0.432 L 0,0 Z"/></g><g transform="translate(27,20)" id="g56"><path id="path58" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-12 4.557,0 c 0,0 1.443,0.204 1.443,1.727 L 6,-2 C 6,-1 6,0 4,0 L 0,0 Z M 9,-11.955 C 9,-13.637 7.637,-15 5.954,-15 l -5.908,0 C -1.637,-15 -3,-13.637 -3,-11.955 l 0,11.91 C -3,1.637 -1.637,3 0.046,3 L 5.954,3 C 7.637,3 9,1.637 9,-0.045 l 0,-11.91 z"/></g><g transform="translate(30,2)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1 -1,-2 -2,-2 l -13,0 c -1,0 -2,1 -2,2 l 0,22.478 c 0,0.84 0.682,1.522 1.523,1.522 l 13.955,0 C -0.682,24 0,23.318 0,22.478 L 0,0 Z"/></g></g></g><g id="g64"><g clip-path="url(#clipPath68)" id="g66"><g transform="translate(28.5117,23.4316)" id="g72"><path id="path74" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.021,0 -1.875,-0.673 -2.168,-1.597 -0.158,0.044 -0.324,0.075 -0.497,0.075 -0.446,0 -0.853,-0.161 -1.177,-0.418 -0.173,1.518 -1.446,2.702 -3.011,2.702 -1.502,0 -2.745,-1.092 -2.993,-2.524 -0.236,0.15 -0.513,0.24 -0.814,0.24 -0.379,0 -0.722,-0.145 -0.989,-0.374 -0.454,1.111 -1.542,1.896 -2.817,1.896 -1.682,0 -3.046,3.807 -3.046,-3.045 0,-1.682 1.364,-3.046 3.046,-3.046 1.275,0 2.363,0.785 2.817,1.897 0.267,-0.23 0.61,-0.374 0.989,-0.374 0.515,0 0.97,0.257 1.245,0.65 0.541,-0.847 1.483,-1.411 2.562,-1.411 0.991,0 1.863,0.48 2.418,1.212 0.278,-0.708 0.963,-1.212 1.77,-1.212 0.723,0 1.343,0.407 1.666,1 0.303,-0.148 0.639,-0.239 0.999,-0.239 1.262,0 2.284,1.023 2.284,2.284 C 2.284,1.523 1.262,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(31,25)" id="g84"><path id="path86" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,2 -1,3 -3,3 l -14,0 c -2,0 -3,-1 -3,-3 l 0,-1.568 c 0,-0.073 0.012,-0.143 0.021,-0.213 -0.013,-0.387 -0.021,-0.818 -0.021,-1.31 0,-1.682 1.364,-3.045 3.045,-3.045 1.275,0 2.364,0.785 2.818,1.896 0.266,-0.23 0.61,-0.374 0.989,-0.374 0.515,0 0.969,0.258 1.245,0.65 0.541,-0.846 1.483,-1.411 2.562,-1.411 0.99,0 1.862,0.48 2.418,1.213 0.278,-0.709 0.963,-1.213 1.77,-1.213 0.722,0 1.342,0.407 1.666,1.001 0.302,-0.149 0.638,-0.24 0.999,-0.24 1.261,0 2.488,1.353 2.488,2.614 0,0.235 0.01,-0.196 0,0 0.004,0.039 0,0.392 0,0.432 L 0,0 Z"/></g><g transform="translate(16,3)" id="g88"><path id="path90" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,11 c 0,0.553 0.448,1 1,1 0.552,0 1,-0.447 1,-1 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(26,3)" id="g92"><path id="path94" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,11 c 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(21,3)" id="g96"><path id="path98" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 l 0,11 c 0,0.553 0.447,1 1,1 0.553,0 1,-0.447 1,-1 L 1,1 C 1,0.447 0.553,0 0,0"/></g><g transform="translate(22,30)" id="g100"><path id="path102" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.448 -1,1 l 0,3 C -1,4.552 -0.553,5 0,5 0.553,5 1,4.552 1,4 L 1,1 C 1,0.448 0.553,0 0,0"/></g><g transform="translate(25,29)" id="g104"><path id="path106" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 4,4 c 0.391,0.391 1.023,0.391 1.414,0 0.391,-0.391 0.391,-1.023 0,-1.414 l -4,-4 C 0.512,0.098 0.256,0 0,0"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M2.72 5.464h3.53v2.679H4.464c-1.786 0-1.786.893-1.786 1.786v7.387c0 1.359 1.289 1.542 1.289 1.542H6.25v2.679H2.72C1.218 21.537 0 20.32 0 18.818V8.183c0-1.501 1.217-2.719 2.72-2.719z"/><path fill="#FFAC33" d="M5.357 5.464h15.179V24c0 1.1-.9 2-2 2H7.357c-1.1 0-2-.9-2-2V5.464z"/><path fill="#F4900C" d="M8.482 23.321c.493 0 .893-.399.893-.893v-9.821c0-.493-.399-.893-.893-.893-.493 0-.893.399-.893.893v9.821c0 .494.4.893.893.893zm4.464 0c.493 0 .893-.399.893-.893v-9.821c0-.493-.399-.893-.893-.893-.493 0-.893.399-.893.893v9.821c.001.494.4.893.893.893zM5.357 8.575V5.464h15.179v4.878c-.292.107-.604.175-.933.175-1.138 0-2.111-.701-2.516-1.694-.238.206-.545.334-.883.334-.46 0-.865-.23-1.111-.58-.483.756-1.324 1.26-2.288 1.26-.884 0-1.663-.429-2.159-1.083-.248.633-.86 1.083-1.58 1.083-.645 0-1.199-.364-1.488-.893-.27.132-.57.213-.892.213-.882 0-1.329-.582-1.329-.582z"/><path fill="#E1E8ED" d="M8.036 1h11.607c1.786 0 2.679.893 2.679 2.679v2.76c0 1.502-1.218 2.719-2.719 2.719-1.138 0-2.111-.701-2.516-1.693-.238.205-.545.334-.883.334-.46 0-.865-.23-1.111-.58-.483.755-1.324 1.259-2.288 1.259-.884 0-1.663-.429-2.159-1.083-.248.633-.86 1.083-1.58 1.083-.62 0-1.15-.34-1.447-.837-.241.229-.564.372-.923.372-.74 0-1.339-.6-1.339-1.339V3.679C5.357 1.893 6.25 1 8.036 1z"/><path d="M30.495 6.514c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.024 0-1.415l3.552-3.55c.391-.39 1.023-.39 1.414 0s.391 1.024 0 1.415l-3.552 3.55c-.195.196-.451.293-.707.293zm-4.164-1.697c-.109 0-.221-.019-.33-.057-.521-.182-.796-.752-.614-1.274l.97-2.773c.183-.521.752-.796 1.274-.614.521.182.796.752.614 1.274l-.97 2.773c-.144.413-.531.671-.944.671zm6.143 5.774c-.412 0-.798-.257-.943-.667-.184-.521.09-1.092.61-1.276l2.494-.881c.522-.185 1.092.09 1.276.61.184.521-.09 1.092-.61 1.276l-2.494.881c-.111.039-.223.057-.333.057z" fill="#FA743E"/><path fill="#FFAC33" d="M33.28 15.464h-3.53v2.679h1.786c1.786 0 1.786.893 1.786 1.786v7.387c0 1.359-1.289 1.542-1.289 1.542H29.75v2.679h3.53c1.502 0 2.72-1.217 2.72-2.719V18.183c0-1.501-1.217-2.719-2.72-2.719z"/><path fill="#FFCC4D" d="M30.643 15.464H15.464V34c0 1.1.9 2 2 2h11.179c1.1 0 2-.9 2-2V15.464z"/><path fill="#F4900C" d="M18.589 33.321c-.493 0-.893-.399-.893-.893v-9.821c0-.493.4-.893.893-.893s.893.399.893.893v9.821c0 .494-.4.893-.893.893zm8.929 0c-.493 0-.893-.399-.893-.893v-9.821c0-.493.399-.893.893-.893.493 0 .893.399.893.893v9.821c0 .494-.4.893-.893.893zm-4.464 0c-.493 0-.893-.399-.893-.893v-9.821c0-.493.399-.893.893-.893s.893.399.893.893v9.821c-.001.494-.4.893-.893.893z"/><path fill="#FFAC33" d="M30.643 18.575v-3.111H15.464v4.878c.292.107.604.175.933.175 1.138 0 2.111-.701 2.516-1.694.238.206.545.334.883.334.46 0 .865-.23 1.111-.58.483.756 1.324 1.26 2.288 1.26.884 0 1.663-.429 2.159-1.083.248.633.86 1.083 1.58 1.083.645 0 1.199-.364 1.488-.893.27.132.57.213.892.213.882 0 1.329-.582 1.329-.582z"/><path fill="#EEE" d="M27.964 11H16.357c-1.786 0-2.679.893-2.679 2.679v2.76c0 1.502 1.218 2.719 2.719 2.719 1.138 0 2.111-.701 2.516-1.693.238.205.545.334.883.334.46 0 .865-.23 1.111-.58.483.755 1.324 1.259 2.288 1.259.884 0 1.663-.429 2.159-1.083.248.633.86 1.083 1.58 1.083.62 0 1.15-.34 1.447-.837.24.229.564.372.922.372.74 0 1.339-.6 1.339-1.339v-2.995C30.643 11.893 29.75 11 27.964 11z"/></svg>
\ No newline at end of file