about summary refs log tree commit diff
path: root/public/emoji/1f3a2.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/1f3a2.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/1f3a2.svg')
-rw-r--r--public/emoji/1f3a2.svg2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3a2.svg b/public/emoji/1f3a2.svg
index 350ee1c32..b1e64ec0e 100644
--- a/public/emoji/1f3a2.svg
+++ b/public/emoji/1f3a2.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:#88c9f9;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><path id="path24" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 16,2 -2,0 0,11 2,0 0,-11 z"/><path id="path26" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 8,2 10,2 10,14 8,14 8,2 Z"/><path id="path28" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,15 -2,0 0,-13 2,0 0,13 z"/><path id="path30" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 28,20 -2,0 0,-18 2,0 0,18 z"/><path id="path32" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 34,25 -2,0 0,-23 2,0 0,23 z"/><path id="path34" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 4,2 2,2 2,15 4,15 4,2 Z"/><g transform="translate(34,27.7778)" id="g36"><path id="path38" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -4.107,-4.63 -13.207,-13.778 -21.001,-13.778 -4.635,0 -8.599,1.417 -10.999,2.528 l 0,-2.201 c 2.615,-1.117 6.483,-2.327 10.999,-2.327 7.764,0 16.238,7.691 21.001,12.785 L 0,0 Z"/></g><g transform="translate(26,22)" id="g40"><path id="path42" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.447,-2 -1,-2 -0.553,0 -1,0.896 -1,2 0,1.105 0.447,2 1,2 0.553,0 1,-0.895 1,-2"/></g><g transform="translate(26,25)" id="g44"><path id="path46" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g><g transform="translate(31,26)" id="g48"><path id="path50" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.447,-2 -1,-2 -0.553,0 -1,0.896 -1,2 0,1.104 0.447,2 1,2 0.553,0 1,-0.896 1,-2"/></g><g transform="translate(30.667,28.6665)" id="g52"><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.333,-2.667 -1,-1 -1.505,1.505 C -3.124,-3.09 -3.95,-3.836 -4.667,-4.44 l 0,-2.227 -1,-1 -1.391,1.391 c -1.382,-0.96 -2.069,-1.309 -2.609,-2.391 -1,-2 -2.001,-6 1,-4 5.582,3.721 12,10 12,10 l 0,6 C 2.468,2.467 1.175,1.175 0,0"/></g><g transform="translate(31,29)" id="g56"><path id="path58" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 -0.553,0 -1,0.448 -1,1 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1"/></g></g></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M32.612 16.645v-1h-4.083V8.333h-1v7.312h-3.11v1h3.11v4H18.55v-4.604h-1v4.604H12.8v1h4.75v4H8.612v-3.208h-1v3.208H2.205v1h5.407v4H2.205v1h5.407V36h1v-4.355h8.938V36h1v-4.355h8.979V36h1v-4.355h4.083v-1h-4.083v-4h4.083v-1h-4.083v-4h4.083v-1h-4.083v-4h4.083zm-24 14v-4h8.938v4H8.612zm18.917 0H18.55v-4h8.979v4zm0-5H18.55v-4h8.979v4z"/><path fill="#CCD6DD" d="M31.05 6.595h4V36h-4z"/><path fill="#8899A6" d="M34.05 6.595h1V36h-1z"/><path fill="#CCD6DD" d="M25.05 10.208l-4 2.417V36h4zm-14 10.709h4V36h-4zm-10 4.791h4V36h-4z"/><path fill="#8899A6" d="M4.05 25.708h1V36h-1zm10-4.791h1V36h-1zm10-10.709h1V36h-1z"/><path fill="#CCD6DD" d="M18.804 16.378C12.948 21.327 6.491 26.771 0 29.035v1.816c7.387-2.665 14.422-8.66 20.363-13.725 4.789-4.083 9.313-7.939 11.764-7.939 1.46 0 2.746.513 3.873 1.337V8.738c-1.11-.651-2.39-1.05-3.873-1.05-3.041 0-8.035 4.221-13.323 8.69z"/><path fill="#DD2E44" d="M32.127 4.688c-4.139 0-9.292 4.355-15.26 9.399C11.523 18.603 5.653 23.558 0 25.84v3.196c6.491-2.265 12.948-7.708 18.804-12.657 5.288-4.469 10.282-8.69 13.323-8.69 1.483 0 2.763.399 3.873 1.05v-3.36c-1.154-.438-2.439-.691-3.873-.691z"/><path fill="#1C6399" d="M10.912 14.422l-.368.29c-.142.112-.348.087-.459-.054l-.918-1.164c-.112-.142-.087-.348.054-.459l.368-.29c.142-.112.348-.087.459.054l.918 1.164c.112.142.088.347-.054.459zm3.438-2.632l-.368.29c-.142.112-.348.087-.459-.054l-.918-1.164c-.112-.142-.087-.348.054-.459l.368-.29c.142-.112.348-.087.459.054l.918 1.164c.112.142.088.347-.054.459zm6.52-5.208l-.368.29c-.142.112-.348.087-.459-.054l-.918-1.164c-.112-.142-.087-.348.054-.459l.368-.29c.142-.112.348-.087.459.054l.918 1.164c.113.141.088.347-.054.459zm3.471-2.664l-.368.29c-.142.112-.348.087-.459-.054l-.918-1.164c-.112-.142-.087-.348.054-.459l.368-.29c.142-.112.348-.087.459.054l.918 1.164c.112.141.088.347-.054.459zm-8.532 9.678c-.217 0-.433-.094-.581-.275-.262-.32-.215-.793.106-1.055l1.409-1.152c.321-.262.794-.216 1.056.106.262.32.215.793-.106 1.055l-1.409 1.152c-.14.113-.308.169-.475.169z"/><path fill="#FFE8B6" d="M8.208 14.542l-2.651-1.751c-.113-.076-.269-.044-.347.071-.076.115-.044.27.071.346l2.651 1.751c.042.028.09.042.138.042.081 0 .16-.04.209-.112.076-.116.044-.27-.071-.347zm3.432-2.677L8.97 9.953c-.112-.081-.269-.056-.349.058-.08.112-.055.269.058.349l2.67 1.912c.044.032.095.047.146.047.078 0 .154-.036.203-.104.08-.113.055-.27-.058-.35zm6.573-5.217l-2.748-1.476c-.12-.065-.271-.02-.339.102-.064.122-.02.273.103.338l2.748 1.476c.037.02.078.03.118.03.089 0 .175-.048.221-.132.064-.121.019-.273-.103-.338zm3.28-2.782L18.86 2.519c-.125-.062-.274-.014-.337.109s-.014.273.108.336l2.633 1.347c.037.019.076.027.114.027.091 0 .179-.05.223-.136.063-.123.014-.273-.108-.336z"/><path fill="#BE1931" d="M10.349 15.069c.82 1.044.676 1.731.154 2.141-.522.41-1.224.387-2.044-.656-.82-1.043-1.062-2.222-.54-2.632.523-.411 1.61.103 2.43 1.147z"/><path fill="#5C913B" d="M13.745 12.401c.82 1.044.676 1.731.154 2.141-.522.41-1.224.387-2.044-.656-.82-1.043-1.062-2.222-.54-2.632.523-.411 1.61.103 2.43 1.147z"/><path fill="#3B94D9" d="M13.599 11.67l-5.892 4.629c-1.522 1.196-.604 4.01-.332 4.356.291.371.829.436 1.2.144l7.459-5.86c.742-.583.871-1.657.288-2.399l-.406-.517c-.583-.743-1.62-.901-2.317-.353z"/><path fill="#FA743E" d="M20.178 7.108c.82 1.044.676 1.731.154 2.141-.522.41-1.224.387-2.043-.657-.82-1.044-1.062-2.222-.539-2.632.521-.41 1.608.104 2.428 1.148z"/><path fill="#744EAA" d="M23.628 4.387c.82 1.044.676 1.731.154 2.141-.522.41-1.224.387-2.043-.657-.82-1.044-1.062-2.222-.539-2.632.521-.41 1.609.104 2.428 1.148z"/><path fill="#3B94D9" d="M23.429 3.709l-5.893 4.629c-1.522 1.195-.604 4.01-.332 4.356.291.371.829.436 1.2.144l7.46-5.859c.742-.583.871-1.657.288-2.399l-.406-.517c-.583-.743-1.621-.901-2.317-.354z"/><path fill="#E1E8ED" d="M9.096 20.838c-.148 0-.295-.066-.394-.192-.171-.217-.132-.532.086-.702l7.059-5.515c.215-.168.53-.132.701.086.171.217.132.532-.086.702l-7.059 5.515c-.09.072-.198.106-.307.106zm9.787-7.906c-.148 0-.295-.066-.394-.192-.171-.217-.132-.532.086-.702l7.059-5.515c.216-.169.53-.132.701.086.171.217.132.532-.086.702l-7.059 5.515c-.091.071-.199.106-.307.106z"/><path fill="#FFDC5D" d="M21.292 1.936c.38.448.371 1.082-.021 1.415-.392.333-1.214.195-1.595-.253-.096-.113-.172-.233-.233-.326-.396-.606.11-.756.45-1.045.392-.333 1.019-.24 1.399.209z"/><path fill="#FFAC33" d="M20.982 1.367s-.29-.237.074-.602c.301-.302.687-.02 1.028-.093.258-.055.462-.223.523-.438 0 0 .005.399-.136.673-.184.356-.596.577-.838.629-.378.082-.651-.169-.651-.169z"/><path fill="#FFAC33" d="M19.256 1.889c.058-.297.514-.744.983-.847.529-.117.921.16 1.17.577.229.383.157.957.157.957s-.503-.196-.457-.244c.085-.09-.104-.426-.247-.436-.151-.011-.162.138-.114.236l.189.375s-.232-.309-.392-.326c-.263-.028-.869.77-1.103.59-.144-.112-.259-.515-.186-.882z"/><path fill="#FFDC5D" d="M7.887 12.757c.419.412.466 1.044.106 1.411-.361.367-1.191.303-1.611-.109-.106-.104-.192-.217-.261-.304-.449-.568.042-.763.354-1.081.36-.366.993-.329 1.412.083z"/><path fill="#FFAC33" d="M7.527 12.218s-.311-.21.02-.607c.273-.327.682-.082 1.016-.185.252-.077.441-.264.481-.483 0 0 .041.397-.075.683-.151.371-.542.628-.778.702-.369.116-.664-.11-.664-.11z"/><path fill="#FFAC33" d="M5.854 12.894c.031-.301.445-.787.903-.932.516-.164.932.077 1.217.47.262.361.242.939.242.939s-.518-.15-.477-.203c.077-.097-.141-.415-.286-.412-.152.003-.149.152-.092.245.057.094.222.357.222.357s-.259-.287-.419-.289c-.264-.004-.796.845-1.045.687-.154-.099-.304-.49-.265-.862z"/><path fill="#FFDC5D" d="M17.818 4.696c.38.448.371 1.082-.021 1.415-.392.333-1.214.195-1.595-.253-.096-.113-.172-.233-.233-.326-.396-.606.11-.756.45-1.045.392-.332 1.018-.239 1.399.209z"/><path fill="#FFAC33" d="M15.781 4.65c.058-.297.514-.744.983-.847.529-.117.921.16 1.17.577.229.383.157.957.157.957s-.503-.196-.457-.244c.085-.09-.104-.426-.247-.436-.151-.011-.162.138-.114.236.049.098.065.163.018.217-.047.055-.327-.187-.486-.204-.263-.028-.602.806-.836.626-.146-.112-.26-.515-.188-.882z"/><path fill="#FFDC5D" d="M11.412 10.056c.38.448.371 1.082-.021 1.415-.392.333-1.214.195-1.595-.253-.096-.113-.172-.233-.233-.326-.396-.606.11-.756.45-1.045.392-.333 1.018-.24 1.399.209z"/><path fill="#FFAC33" d="M9.375 10.01c.058-.297.514-.744.983-.847.529-.117.921.16 1.17.577.229.383.157.957.157.957s-.503-.196-.457-.244c.085-.09-.104-.426-.247-.436-.151-.011-.162.138-.114.236.049.098.065.163.018.217s-.327-.187-.486-.204c-.263-.028-.602.806-.836.626-.146-.113-.26-.516-.188-.882z"/><path fill="#FFE8B6" d="M21.767 3.65L19 1.255c-.105-.09-.263-.078-.354.025-.09.104-.078.262.026.353l2.767 2.395c.048.041.106.061.164.061.07 0 .14-.029.189-.086.091-.105.08-.263-.025-.353zm-3.472 2.614l-2.572-2.071c-.108-.086-.266-.069-.352.038-.087.107-.07.265.037.352l2.574 2.071c.046.037.102.055.156.055.073 0 .146-.032.194-.093.088-.108.071-.265-.037-.352zm-9.831 8.052l-2.77-2.472c-.101-.091-.259-.083-.353.02-.092.103-.083.261.021.353l2.77 2.472c.047.042.106.063.166.063.068 0 .137-.028.187-.083.091-.103.082-.261-.021-.353zm3.429-2.678L9.25 9.156c-.099-.094-.257-.09-.354.011-.094.101-.089.259.012.353l2.644 2.482c.048.045.109.068.171.068.066 0 .133-.026.183-.079.093-.1.088-.259-.013-.353z"/></svg>
\ No newline at end of file