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/1f3df.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/1f3df.svg')
-rw-r--r-- | public/emoji/1f3df.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3df.svg b/public/emoji/1f3df.svg index 4b9818a8e..248c6d9e9 100644 --- a/public/emoji/1f3df.svg +++ b/public/emoji/1f3df.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,36 C 1.791,36 0,34.209 0,32 L 0,32 0,4 C 0,1.791 1.791,0 4,0 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,28 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath><clipPath id="clipPath72" clipPathUnits="userSpaceOnUse"><path id="path74" d="M 2.948,9.504 2.944,10.363 C 2.947,9.824 2.951,9.257 2.951,9.247 l 0,0 C 2.978,6.473 9.711,4.064 17.987,3.988 l 0,0 c 8.277,-0.074 14.962,2.264 14.935,5.038 l 0,0 c 0,0.02 -0.01,0.207 -0.011,0.207 l 0,0 -0.009,1.826 -0.077,7.82 -29.972,0.27 0.095,-9.645 z"/></clipPath><clipPath id="clipPath100" clipPathUnits="userSpaceOnUse"><path id="path102" 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"><path id="path20" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 38,21 -39,0 0,-24 39,0 0,24 z"/><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 39,21 -41,0 0,17 41,0 0,-17 z"/></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(5.7085,28.8125)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.314,-0.239 3.274,-0.98 3.776,-1.267 4.278,-1.554 3.968,-1.697 3.49,-1.912 3.012,-2.127 0.43,-2.82 0.048,-2.892 -0.335,-2.964 0,0 0,0"/></g><g transform="translate(5.5,18)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#66757f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 0,11"/></g><g transform="translate(13.7085,30.8125)" id="g40"><path id="path42" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.314,-0.239 3.274,-0.98 3.776,-1.267 4.278,-1.554 3.968,-1.697 3.49,-1.912 3.012,-2.127 0.43,-2.82 0.048,-2.892 -0.335,-2.964 0,0 0,0"/></g><g transform="translate(13.5,20)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#66757f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 0,11"/></g><g transform="translate(22.709,30.8125)" id="g48"><path id="path50" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.314,-0.239 3.273,-0.98 3.775,-1.267 4.277,-1.554 3.967,-1.697 3.489,-1.912 3.012,-2.127 0.43,-2.82 0.047,-2.892 -0.336,-2.964 0,0 0,0"/></g><g transform="translate(22.5,20)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#66757f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 0,11"/></g><g transform="translate(30.709,28.8125)" id="g56"><path id="path58" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.314,-0.239 3.273,-0.98 3.775,-1.267 4.277,-1.554 3.967,-1.697 3.489,-1.912 3.012,-2.127 0.43,-2.82 0.047,-2.892 -0.336,-2.964 0,0 0,0"/></g><g transform="translate(30.5,18)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#66757f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 0,11"/></g><g transform="translate(32.8252,18.8789)" id="g64"><path id="path66" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -29.972,0.27 0.095,-9.645 -0.009,1.826 c -0.001,0 0.011,-2.063 0.011,-2.083 0.028,-2.774 6.761,-5.183 15.037,-5.259 8.277,-0.074 14.962,2.264 14.935,5.038 0,0.02 -0.01,0.207 -0.011,0.207 L 0.077,-7.819 0,0 Z"/></g></g></g><g id="g68"><g clip-path="url(#clipPath72)" id="g70"><g transform="translate(21.958,7.5928)" id="g76"><path id="path78" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.09,-9.133 -1.744,-4.551 -3.952,-4.53 -2.206,0.019 -3.887,-10.923 -4.041,4.602 -0.036,3.653 1.744,4.55 3.951,4.53 C -1.835,4.582 -0.036,3.652 0,0"/></g><g transform="translate(8.9971,2.9697)" id="g80"><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.006,-0.94 2.934,6.366 c 0,0 0.018,-1.827 0,0 -0.018,1.826 -3.024,2.767 -3.006,0.94 0.018,-1.826 0,0 0,0 L 0,0 Z"/></g><g transform="translate(26.9893,1.8945)" id="g84"><path id="path86" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.997,0.027 -0.072,7.306 c 0,0 0.017,-1.827 0,0 -0.019,1.826 2.969,2.712 2.988,0.886 0.017,-1.826 0,0 0,0 L 0,0 Z"/></g><g transform="translate(6.9897,3.9014)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.063,6.393 c 0,0 0.009,-0.913 -0.009,0.913 -0.018,1.826 -2.025,2.757 -2.007,0.931 0.017,-1.827 0,0 0,0 L -2.007,0.932 0,0 Z"/></g><g transform="translate(28.9785,2.79)" id="g92"><path id="path94" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.072,7.306 c 0,0 0.009,-0.913 -0.01,0.913 -0.018,1.826 1.972,2.722 1.989,0.895 0.019,-1.827 0,0 0,0 L 1.998,-0.018 0,0 Z"/></g></g></g><g id="g96"><g clip-path="url(#clipPath100)" id="g98"><g transform="translate(32.8252,18.8223)" id="g104"><path id="path106" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.027,-2.774 -6.659,-4.963 -14.936,-4.888 -8.276,0.075 -15.008,2.385 -15.036,5.158 -0.027,2.774 6.66,4.962 14.937,4.888 C -6.759,5.083 -0.027,2.773 0,0"/></g><g transform="translate(30.6465,18.1807)" id="g108"><path id="path110" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.024,-2.509 -5.686,-4.491 -12.755,-4.428 -7.071,0.065 -12.821,2.151 -12.846,4.659 -0.025,2.509 5.686,4.491 12.756,4.427 C -5.776,4.594 -0.024,2.509 0,0"/></g><g transform="translate(25.8594,16.1455)" id="g112"><path id="path114" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.015,-1.48 -3.553,-2.648 -7.966,-2.607 -4.414,0.04 -8.005,1.272 -8.019,2.752 C -16,1.624 -12.434,2.79 -8.019,2.751 -3.605,2.711 -0.015,1.479 0,0"/></g><g transform="translate(24.9248,15.959)" id="g116"><path id="path118" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.011,-1.107 -3.126,-1.975 -7.005,-1.939 -3.88,0.035 -7.034,0.96 -7.045,2.066 -0.011,1.105 3.126,1.974 7.005,1.938 C -3.166,2.031 -0.012,1.105 0,0"/></g><g transform="translate(12.5542,23.0854)" id="g120"><path id="path122" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 2.359,-4.958 3.169,-4.823 2.058,0.21 0,0 Z"/></g><g transform="translate(23.6689,22.9854)" id="g124"><path id="path126" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.262,-4.917 -0.813,0.15 1.012,5.014 L 0,0 Z"/></g><g transform="translate(11.6108,17.4443)" id="g128"><path id="path130" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.347,0.374 -4.412,4.177 -4.412,4.177 l -1.489,-0.9 5.28,-3.614 L 0,0 Z"/></g><g transform="translate(24.2549,17.3301)" id="g132"><path id="path134" style="fill:#e9f0f4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.34,0.367 4.33,4.098 4.33,4.098 L 5.838,3.171 0.628,-0.349 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DC" d="M35.858 17.376L.079 17.053v11.821c.011 1.084 1.009 2.12 2.52 3.028l2.396 1.133c.732.278 1.531.534 2.393.766l3.585.762c.791.127 1.615.232 2.46.32l9.328.088c.868-.075 1.714-.167 2.524-.285l3.57-.707c.857-.219 1.652-.463 2.378-.73l2.374-1.098c1.507-.893 2.262-1.923 2.251-3.013V17.376z"/><path fill="#66757F" d="M22.885 30.848c-.043-4.36-2.19-5.47-4.825-5.493-2.634-.024-4.759 1.047-4.716 5.407.016 1.606.046 2.96.089 4.12 1.504.156 3.079.254 4.712.269 1.6.014 3.141-.054 4.616-.18.097-1.003.142-2.341.124-4.123zM10.917 28.89l.001.107.003.364.003.271.001.065c.001.052 0 .044 0 0l-.001-.065-.003-.271-.003-.364-.001-.107-.001-.122c-.022-2.18-3.61-3.303-3.589-1.122v.037l.002.204.002.158.005.47.001.067.051 5.218c1.106.297 2.302.556 3.585.762l-.056-5.753v.081zm17.878-.992l.005.506v.027l.003.27c.001.118.001.15 0 0l-.003-.27v-.027l-.005-.506-.001-.058c-.022-2.18-3.589-1.123-3.567 1.057v.036l.057 5.753c1.279-.186 2.47-.426 3.57-.707l-.06-6.1.001.019zM4.931 26.534c-.022-2.18-2.417-3.292-2.396-1.112v.041l.063 6.439c.676.406 1.483.785 2.396 1.133l-.052-5.321c.003.208.006.582-.011-1.18zm26.237.237l.012 1.137v-.047.047l.053 5.34c.906-.334 1.705-.701 2.374-1.098l-.064-6.448c-.021-2.18-2.396-1.111-2.375 1.069zM2.972 5.225c-.276 0-.5.224-.5.5v12.37c0 .276.224.5.5.5s.5-.224.5-.5V5.725c0-.277-.223-.5-.5-.5z"/><path fill="#DD2F45" d="M3.207 5.936c1.478.269 3.682 1.102 4.246 1.424.564.322.215.484-.322.725-.538.242-3.441 1.021-3.87 1.102-.431.082-.054-3.251-.054-3.251z"/><path fill="#66757F" d="M11.969 2.976c-.276 0-.5.224-.5.5v12.37c0 .276.224.5.5.5s.5-.224.5-.5V3.476c0-.277-.224-.5-.5-.5z"/><path fill="#226798" d="M12.203 3.687c1.478.269 3.682 1.102 4.247 1.425.564.322.215.484-.322.725-.538.242-3.44 1.021-3.87 1.102-.432.081-.055-3.252-.055-3.252z"/><path fill="#66757F" d="M21.339 2.976c-.276 0-.5.224-.5.5v12.37c0 .276.224.5.5.5s.5-.224.5-.5V3.476c0-.277-.224-.5-.5-.5z"/><path fill="#DD2F45" d="M21.574 3.687c1.478.269 3.681 1.102 4.246 1.425.564.322.215.484-.322.725-.537.242-3.44 1.021-3.871 1.102-.431.081-.053-3.252-.053-3.252z"/><path fill="#66757F" d="M30.335 5.225c-.276 0-.5.224-.5.5v12.37c0 .276.224.5.5.5s.5-.224.5-.5V5.725c0-.277-.224-.5-.5-.5z"/><path fill="#226798" d="M30.57 5.936c1.478.269 3.681 1.102 4.246 1.425.564.322.215.484-.322.725-.537.242-3.44 1.021-3.871 1.102-.43.081-.053-3.252-.053-3.252z"/><path fill="#E9EFF3" d="M35.858 17.444c.033 3.312-7.949 5.924-17.829 5.835C8.148 23.19.112 20.431.08 17.121c-.033-3.312 7.95-5.924 17.83-5.835 9.879.09 17.915 2.847 17.948 6.158z"/><path fill="#7450A0" d="M33.257 18.209c.029 2.995-6.788 5.361-15.226 5.286-8.44-.077-15.305-2.567-15.334-5.562-.029-2.994 6.787-5.36 15.227-5.284 8.437.077 15.304 2.566 15.333 5.56z"/><path fill="#E9EFF3" d="M26.766 19.378l5.83-3.939-1.8-1.106s-3.63 3.394-4.822 4.548c-.876-.455-2.073-.837-3.486-1.104l2.439-5.303-2.463-.294-1.094 5.419c-1.059-.145-2.202-.233-3.401-.244-.928-.008-1.823.031-2.671.106l-1.183-5.357-2.457.251 2.491 5.235c-1.64.226-3.037.604-4.036 1.085-1.271-1.227-4.847-4.573-4.847-4.573l-1.778 1.074 5.814 3.98c-.541.397-.847.84-.843 1.311.018 1.766 4.303 3.237 9.573 3.285 5.268.048 9.527-1.346 9.51-3.113-.004-.445-.281-.872-.776-1.261z"/><path fill="#5C903F" d="M26.427 20.862c.013 1.321-3.732 2.357-8.363 2.315-4.631-.042-8.396-1.146-8.409-2.467-.013-1.32 3.731-2.356 8.362-2.314 4.63.041 8.396 1.146 8.41 2.466z"/></svg> \ No newline at end of file |