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/1f1ff-1f1fc.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/1f1ff-1f1fc.svg')
-rw-r--r-- | public/emoji/1f1ff-1f1fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1ff-1f1fc.svg b/public/emoji/1f1ff-1f1fc.svg index aeb9a3c81..15a846456 100644 --- a/public/emoji/1f1ff-1f1fc.svg +++ b/public/emoji/1f1ff-1f1fc.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 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath50" clipPathUnits="userSpaceOnUse"><path id="path52" 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:#319209;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></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#ffd200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,8 0,8 0,28 36,28 36,8 Z"/><path id="path34" style="fill:#de200f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,12 0,12 0,24 36,24 36,12 Z"/><path id="path36" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 36,16 -36,0 0,4 36,0 0,-4 z"/><g transform="translate(1,31)" id="g38"><path id="path40" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 17,-13 0,-26 -1,-26 -1,0 0,0 Z"/></g><g transform="translate(0,31)" id="g42"><path id="path44" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 17,-13 0,-26 0,0 Z"/></g></g></g><g id="g46"><g clip-path="url(#clipPath50)" id="g48"><g transform="translate(6.6816,24.4033)" id="g54"><path id="path56" style="fill:#de200f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.784,-3.614 5.772,-4.193 2.886,-7.006 3.567,-10.979 0,-9.103 l -3.567,-1.876 0.681,3.973 -2.885,2.813 3.987,0.579 L 0,0 Z"/></g><g transform="translate(2.875,22.125)" id="g58"><path id="path60" style="fill:#ffd200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.167,0.625 0.75,0.75 0.375,0.917 1.25,1.042 1.917,0 0.666,-1.042 1.041,-1.583 1.958,-2.333 0.917,-0.75 3.958,-2.875 3.958,-2.875 l -0.5,0 -0.825,-3.568 -5.957,0 L 0.917,-6 c 0,0 -0.667,0.291 -0.084,1.458 0.584,1.167 0.917,1.541 0.834,2.875 C 1.583,-0.333 0.958,0.292 0,0"/></g><g transform="translate(2.875,22.125)" id="g62"><path id="path64" style="fill:none;stroke:#f15a29;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 0,0 c 0,0 0.167,0.625 0.75,0.75 0.375,0.917 1.25,1.042 1.917,0 0.666,-1.042 1.041,-1.583 1.958,-2.333 0.917,-0.75 3.958,-2.875 3.958,-2.875 l -0.5,0 -0.825,-3.568 -5.957,0 L 0.917,-6 c 0,0 -0.667,0.291 -0.084,1.458 0.584,1.167 0.917,1.541 0.834,2.875 C 1.583,-0.333 0.958,0.292 0,0 Z"/></g><g transform="translate(10.9585,17.6665)" id="g66"><path id="path68" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.031,0.365 -3.792,0.49 -0.76,0.125 -1.354,1.312 -1.354,1.312 L -5.49,1.566 c 0,0 0.625,-1.368 1.532,-1.566 0.906,-0.198 3.837,-0.523 3.837,-0.523 L 0,0 Z"/></g><g transform="translate(10.6855,16.3164)" id="g70"><path id="path72" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.061,0.494 -3.873,0.542 -0.813,0.048 -1.625,-0.347 -1.75,-0.766 0,0 1.281,0.107 1.937,0 0.657,-0.106 3.574,-0.262 3.574,-0.262 L 0,0 Z"/></g><g transform="translate(5.7187,15.125)" id="g74"><path id="path76" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 2.523,0.169 4.596,-0.241 l -0.181,-0.785 -4.259,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M10.154 12L1.833 5.637c-.176.114-.344.242-.5.381v.001C.515 6.752 0 7.816 0 9v18c0 1.184.515 2.248 1.333 2.981.156.14.324.267.501.382L18 18l-7.846-6z"/><path fill="#DE200F" d="M6.682 11.597l1.783 3.613 3.989.58-2.887 2.813.682 3.972-3.567-1.876-3.567 1.876.681-3.972L.91 15.79l3.988-.58z"/><path fill="#FFD200" d="M7.5 15.458c-.917-.75-1.292-1.292-1.958-2.333s-1.542-.917-1.917 0c-.583.125-.75.75-.75.75.958-.292 1.583.333 1.667 1.667s-.25 1.708-.833 2.875.083 1.458.083 1.458l.384 2.026h5.958l.825-3.568h.5c-.001 0-3.042-2.125-3.959-2.875z"/><path fill="#FFAC33" d="M5.812 16.531l-.344.236s.625 1.369 1.531 1.566 3.837.523 3.837.523l.121-.523s-3.031-.365-3.792-.49-1.353-1.312-1.353-1.312zm-.75 3.376s1.281-.106 1.938 0c.613.099 3.193.242 3.534.261l.113-.49c-.349-.056-3.075-.491-3.835-.536-.812-.048-1.624.346-1.75.765zm.657.968l.156 1.026h4.258l.182-.785c-2.073-.41-4.596-.241-4.596-.241z"/><path fill="#F15A29" d="M10.173 21.951H4.134l-.008-.04-.379-2.003c-.058-.032-.201-.132-.278-.345-.109-.3-.043-.693.194-1.169.088-.176.171-.334.247-.481.42-.806.651-1.25.582-2.369-.047-.746-.264-1.273-.627-1.525-.263-.182-.591-.214-.975-.097l-.086.026.023-.087c.007-.026.176-.638.762-.78.186-.438.494-.707.847-.739.407-.035.814.231 1.148.755.643 1.004 1.021 1.564 1.948 2.322.905.74 3.925 2.852 3.956 2.873l.13.091h-.619l-.826 3.568zm-5.956-.099h5.876l.825-3.568h.382c-.591-.415-3.032-2.132-3.832-2.787-.938-.768-1.32-1.332-1.968-2.345-.313-.491-.694-.744-1.055-.709-.322.029-.604.285-.774.701l-.01.024-.026.005c-.418.09-.612.458-.681.627.376-.094.701-.048.968.137.39.27.622.824.67 1.601.072 1.147-.164 1.6-.592 2.422-.076.146-.158.304-.246.479-.221.442-.287.817-.191 1.087.081.225.243.3.25.303l.024.011.005.025.375 1.987z"/><path fill="#319209" d="M35.873 8C35.429 6.275 33.864 5 32 5H4c-.798 0-1.542.234-2.166.636l-.001.001L4.923 8h30.95zm0 20c-.444 1.725-2.01 3-3.873 3H4c-.798 0-1.542-.234-2.166-.636l-.001-.001L4.923 28h30.95z"/><path fill="#FFD200" d="M4.923 8L18 18 4.923 28h30.95c.083-.321.127-.653.127-1V9c0-.343-.046-.682-.127-1 0-.002-30.95 0-30.95 0z"/><path fill="#DE200F" d="M10.154 12l5.231 4H36v-4zm0 12H36v-4H15.385z"/><path fill="#141414" d="M15.385 16L1.833 5.637c-.176.114-.344.242-.5.381v.001L17 18 1.333 29.981c.156.14.324.267.501.382L15.385 20H36v-4H15.385z"/></svg> \ No newline at end of file |