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/1f9e4.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/1f9e4.svg')
-rw-r--r-- | public/emoji/1f9e4.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9e4.svg b/public/emoji/1f9e4.svg index 4f34ac565..1b028b2aa 100644 --- a/public/emoji/1f9e4.svg +++ b/public/emoji/1f9e4.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(33.334,8.9037)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.588,1.143 -1.532,4.627 -1.246,5.975 0.285,1.349 1.015,3.976 0.401,6.053 l -2.274,7.708 c 0,0 -0.108,1.503 -1.519,1.122 -1.949,-0.526 -1.501,-2.044 -1.501,-2.044 l 0.716,-3.091 1.156,-2.42 c 0,0 -0.701,-0.206 -1.551,2.674 -0.851,2.882 -2.872,9.732 -2.872,9.732 0,0 -0.067,1.488 -1.485,1.133 -1.85,-0.463 -1.521,-2.101 -1.521,-2.101 l 2.661,-9.02 c -0.401,-0.05 -0.456,-0.203 -0.46,-0.191 l -2.905,9.846 c 0,0 0.079,1.46 -1.355,1.179 -1.92,-0.378 -1.694,-2.081 -1.694,-2.081 l 2.938,-9.851 c 0.004,-0.012 -0.479,-0.156 -0.473,-0.176 l -2.506,8.494 c 0,0 0.059,1.546 -1.355,1.178 -2.018,-0.524 -1.659,-2.142 -1.659,-2.142 l 2.677,-9.05 c 0.024,-0.082 -0.45,-0.226 -0.42,-0.33 l -1.92,6.507 c 0,0 0.079,1.462 -1.354,1.179 -1.838,-0.364 -1.448,-2.006 -1.448,-2.006 l 3.101,-10.511 0.037,0.012 c -0.021,-0.006 0.074,-0.474 0.17,-0.711 0.604,-1.49 1.395,-2.727 2.324,-3.706 0.029,-0.094 0.078,-0.186 0.163,-0.277 0.969,-1.036 3.395,-4.267 4.325,-7.59 0.581,-2.077 4.215,-0.914 5.025,-0.556 1.079,0.477 -0.64,3.611 -0.752,4.311 -0.112,0.701 0.618,1.482 1.096,0.511 0.479,-0.972 0.646,-4.026 1.657,-3.836 1.012,0.191 2.888,1.17 3.559,1.855 C 0.177,-1.77 0.588,-1.143 0,0"/></g><g transform="translate(33.7944,9.0946)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.588,1.143 -1.532,4.627 -1.247,5.975 0.286,1.349 1.015,3.976 0.402,6.053 l -2.274,7.708 c 0,0 -0.413,1.401 -1.815,0.988 -1.401,-0.414 -0.988,-1.815 -0.988,-1.815 l 0.887,-3.004 0.768,-2.602 c 0,0 -0.701,-0.206 -1.551,2.674 -0.851,2.882 -2.872,9.732 -2.872,9.732 0,0 -0.414,1.401 -1.815,0.988 -1.401,-0.414 -0.988,-1.815 -0.988,-1.815 l 2.715,-9.203 c -0.005,0.02 -0.713,-0.161 -0.717,-0.149 l -2.905,9.846 c 0,0 -0.414,1.401 -1.815,0.988 -1.401,-0.414 -0.988,-1.815 -0.988,-1.815 l 2.905,-9.847 c 0.004,-0.012 -0.692,-0.235 -0.686,-0.255 l -2.506,8.494 c 0,0 -0.414,1.401 -1.815,0.988 -1.402,-0.414 -0.988,-1.815 -0.988,-1.815 l 2.665,-9.03 c 0.024,-0.083 -0.649,-0.383 -0.619,-0.487 l -1.92,6.507 c 0,0 -0.413,1.402 -1.815,0.988 -1.401,-0.414 -0.987,-1.815 -0.987,-1.815 l 3.101,-10.511 0.037,0.012 c -0.021,-0.006 0.074,-0.474 0.17,-0.712 0.604,-1.489 1.395,-2.726 2.324,-3.705 0.029,-0.094 0.078,-0.187 0.163,-0.277 0.969,-1.036 3.395,-4.267 4.325,-7.59 0.581,-2.078 4.215,-0.914 5.025,-0.556 1.079,0.477 -0.64,3.611 -0.752,4.311 -0.112,0.701 0.618,1.482 1.096,0.511 0.479,-0.972 0.646,-4.026 1.657,-3.836 1.012,0.191 2.888,1.17 3.559,1.855 C 0.177,-1.77 0.588,-1.143 0,0"/></g><g transform="translate(29.7425,9.9753)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.09,0.681 -3.683,3.193 -4.127,4.498 -0.444,1.305 -1.16,3.935 -2.749,5.407 l -5.895,5.461 c 0,0 -0.862,1.237 -1.88,0.188 -1.405,-1.449 -0.245,-2.524 -0.245,-2.524 l 2.196,-2.291 2.231,-1.488 c 0,0 -0.497,-0.536 -2.701,1.505 -2.204,2.042 -7.443,6.895 -7.443,6.895 0,0 -0.819,1.245 -1.856,0.215 -1.353,-1.344 -0.233,-2.584 -0.233,-2.584 l 6.9,-6.391 c -0.32,-0.248 -0.289,-0.408 -0.299,-0.399 l -7.53,6.976 c 0,0 -0.679,1.295 -1.767,0.32 -1.457,-1.306 -0.393,-2.654 -0.393,-2.654 L -18.229,6.17 C -18.22,6.162 -18.56,5.791 -18.545,5.777 l -6.497,6.018 c 0,0 -0.74,1.36 -1.767,0.32 -1.466,-1.482 -0.33,-2.689 -0.33,-2.689 l 6.927,-6.409 c 0.064,-0.058 -0.271,-0.424 -0.191,-0.498 l -4.978,4.611 c 0,0 -0.679,1.296 -1.766,0.32 -1.394,-1.252 -0.219,-2.465 -0.219,-2.465 0,0 7.866,-7.274 8.039,-7.446 0.174,-0.173 0.536,-0.496 0.536,-0.496 1.319,-1.112 2.401,-1.536 3.798,-2.031 0.156,-0.056 0.256,-0.086 0.375,-0.12 1.363,-0.395 5.1,-1.931 7.598,-4.312 1.561,-1.488 4.09,1.37 4.603,2.093 0.683,0.961 -2.397,2.775 -2.851,3.32 -0.454,0.545 -0.227,1.589 0.681,0.999 0.909,-0.591 2.614,-3.13 3.386,-2.449 0.772,0.681 1.883,2.482 2.109,3.413 C 1.057,-1.43 1.09,-0.681 0,0"/></g><g transform="translate(30.0405,10.3748)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.09,0.681 -3.682,3.193 -4.126,4.498 -0.445,1.305 -1.161,3.935 -2.75,5.407 l -5.895,5.461 c 0,0 -1.072,0.993 -2.066,-0.079 -0.992,-1.072 0.08,-2.064 0.08,-2.064 l 2.297,-2.129 1.991,-1.843 c 0,0 -0.497,-0.536 -2.7,1.505 -2.205,2.042 -7.444,6.895 -7.444,6.895 0,0 -1.072,0.993 -2.065,-0.079 -0.993,-1.072 0.079,-2.065 0.079,-2.065 l 7.038,-6.52 c -0.015,0.014 -0.53,-0.504 -0.539,-0.495 l -7.531,6.975 c 0,0 -1.072,0.994 -2.065,-0.078 -0.993,-1.072 0.079,-2.065 0.079,-2.065 l 7.531,-6.977 c 0.009,-0.008 -0.474,-0.556 -0.459,-0.57 l -6.497,6.018 c 0,0 -1.072,0.993 -2.065,-0.079 -0.993,-1.072 0.079,-2.065 0.079,-2.065 l 6.907,-6.398 c 0.064,-0.058 -0.362,-0.66 -0.282,-0.734 L -25.38,7.13 c 0,0 -1.073,0.992 -2.065,-0.08 -0.993,-1.072 0.079,-2.065 0.079,-2.065 l 8.039,-7.447 c 0,0 0.332,-0.341 0.536,-0.495 1.281,-0.972 2.444,-1.603 3.741,-2.01 0.126,-0.042 0.313,-0.107 0.433,-0.141 1.362,-0.395 5.099,-1.931 7.597,-4.312 1.562,-1.488 4.09,1.37 4.603,2.092 0.683,0.962 -2.396,2.775 -2.851,3.32 -0.454,0.545 -0.227,1.59 0.681,1 0.909,-0.591 2.614,-3.13 3.386,-2.449 0.772,0.681 1.883,2.482 2.109,3.413 C 1.057,-1.43 1.09,-0.681 0,0"/></g><g transform="translate(19.0967,8.376)" id="g36"><path id="path38" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.067,0 -0.136,0.014 -0.202,0.043 l -6.529,2.883 c -0.253,0.111 -0.367,0.406 -0.256,0.659 0.112,0.252 0.406,0.366 0.66,0.255 L 0.202,0.957 C 0.454,0.846 0.569,0.551 0.457,0.298 0.375,0.111 0.191,0 0,0"/></g><g transform="translate(21.5938,11.373)" id="g40"><path id="path42" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.127,0 -0.253,0.048 -0.351,0.144 l -5.252,5.167 c -0.197,0.193 -0.2,0.51 -0.006,0.707 0.193,0.197 0.51,0.199 0.707,0.005 L 0.351,0.857 C 0.548,0.663 0.55,0.347 0.356,0.15 0.259,0.05 0.129,0 0,0"/></g><g transform="translate(20.3682,9.9199)" id="g44"><path id="path46" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.098,0 -0.195,0.028 -0.281,0.087 l -6.235,4.241 c -0.229,0.155 -0.288,0.466 -0.132,0.694 0.155,0.229 0.467,0.287 0.694,0.132 L 0.281,0.913 C 0.51,0.758 0.568,0.447 0.413,0.219 0.316,0.076 0.159,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M33.334 27.096c-.588-1.143-1.532-4.627-1.246-5.976.286-1.349 1.015-3.975.402-6.053L30.216 7.36s-.108-1.503-1.519-1.122c-1.949.526-1.501 2.043-1.501 2.043l.715 3.092 1.157 2.42s-.701.206-1.551-2.674l-2.872-9.731S24.578-.1 23.16.255c-1.85.463-1.521 2.102-1.521 2.102l2.662 9.02c-.402.05-.456.203-.46.191l-2.905-9.846S21.015.261 19.582.543c-1.92.377-1.695 2.08-1.695 2.08l2.939 9.851c.003.012-.479.156-.473.176l-2.506-8.494s.059-1.547-1.355-1.179c-2.018.525-1.659 2.142-1.659 2.142l2.676 9.05c.024.083-.45.226-.419.33l-1.92-6.507s.079-1.461-1.355-1.178c-1.837.363-1.448 2.006-1.448 2.006l3.101 10.51.037-.011c-.02.005.074.474.17.711.604 1.49 1.395 2.726 2.324 3.706.029.094.078.186.163.277.969 1.036 3.396 4.267 4.325 7.59.581 2.078 4.215.914 5.026.556 1.078-.477-.641-3.61-.753-4.311-.112-.701.618-1.482 1.096-.51.479.972.646 4.026 1.657 3.835 1.012-.191 2.888-1.17 3.558-1.855.44-.452.851-1.079.263-2.222z"/><path fill="#66757F" d="M33.794 26.905c-.588-1.143-1.532-4.627-1.246-5.976.286-1.349 1.015-3.975.402-6.053L30.676 7.17s-.413-1.401-1.816-.988c-1.4.414-.987 1.815-.987 1.815L28.759 11l.768 2.602s-.701.206-1.551-2.675l-2.872-9.731S24.69-.205 23.289.208c-1.401.414-.988 1.815-.988 1.815l2.715 9.203c-.006-.02-.713.162-.717.15L21.394 1.53S20.981.128 19.579.542c-1.401.414-.988 1.815-.988 1.815l2.905 9.847c.003.012-.692.235-.686.255l-2.506-8.494s-.414-1.401-1.815-.988c-1.401.414-.988 1.815-.988 1.815l2.665 9.03c.024.083-.649.383-.618.486l-1.92-6.507s-.414-1.401-1.815-.987c-1.401.414-.988 1.815-.988 1.815l3.102 10.51.037-.011c-.02.005.074.474.17.711.604 1.49 1.395 2.726 2.324 3.705.029.094.078.187.163.277.969 1.036 3.396 4.267 4.325 7.59.581 2.078 4.215.914 5.026.556 1.078-.477-.641-3.61-.753-4.311-.112-.7.618-1.482 1.096-.51.479.972.646 4.026 1.657 3.835 1.012-.191 2.888-1.17 3.558-1.855.441-.451.853-1.078.264-2.221z"/><path fill="#66757F" d="M29.743 26.025c-1.09-.681-3.683-3.193-4.127-4.498-.444-1.305-1.16-3.935-2.75-5.407l-5.895-5.461s-.861-1.236-1.879-.188c-1.406 1.448-.245 2.523-.245 2.523l2.196 2.291 2.231 1.488s-.497.536-2.701-1.505L9.129 8.373s-.819-1.244-1.855-.214c-1.353 1.344-.233 2.584-.233 2.584l6.899 6.391c-.32.248-.288.408-.298.399l-7.531-6.976s-.679-1.296-1.767-.321c-1.457 1.306-.393 2.654-.393 2.654l7.563 6.964c.009.008-.332.379-.317.393l-6.496-6.018s-.74-1.359-1.767-.32c-1.466 1.483-.33 2.689-.33 2.689l6.928 6.409c.063.058-.271.424-.192.498l-4.977-4.611s-.679-1.296-1.767-.32c-1.393 1.252-.219 2.464-.219 2.464s7.866 7.274 8.039 7.447c.173.172.536.496.536.496 1.319 1.112 2.401 1.536 3.798 2.031.156.056.257.086.376.12 1.363.395 5.1 1.931 7.597 4.311 1.562 1.488 4.09-1.37 4.603-2.092.683-.961-2.397-2.775-2.851-3.32-.454-.545-.227-1.589.681-.999s2.613 3.13 3.385 2.448c.772-.681 1.884-2.482 2.11-3.413.148-.612.181-1.361-.908-2.042z"/><path fill="#99AAB5" d="M30.041 25.625c-1.09-.681-3.682-3.193-4.127-4.498-.444-1.305-1.16-3.935-2.75-5.407l-5.895-5.461s-1.072-.993-2.065.079c-.992 1.072.08 2.064.08 2.064l2.297 2.128 1.991 1.844s-.497.536-2.701-1.505L9.427 7.974s-1.072-.993-2.065.079c-.992 1.072.079 2.065.079 2.065l7.039 6.52c-.015-.014-.53.504-.54.495l-7.531-6.976s-1.072-.993-2.065.079c-.993 1.072.079 2.064.079 2.064l7.532 6.977c.009.008-.475.556-.46.57L4.999 13.83s-1.072-.993-2.065.079c-.993 1.072.079 2.065.079 2.065l6.907 6.398c.063.059-.362.661-.283.734l-4.977-4.61s-1.072-.993-2.065.08c-.993 1.072.079 2.065.079 2.065l8.039 7.447s.332.341.536.496c1.28.972 2.444 1.603 3.741 2.01.127.042.314.107.433.141 1.363.395 5.1 1.931 7.597 4.311 1.562 1.489 4.09-1.37 4.603-2.092.683-.961-2.397-2.775-2.851-3.32-.454-.545-.227-1.589.681-.999s2.613 3.13 3.385 2.448c.772-.681 1.884-2.482 2.11-3.413.149-.614.182-1.364-.907-2.045z"/><path fill="#66757F" d="M19.097 27.624c-.067 0-.136-.014-.202-.043l-6.529-2.883c-.252-.111-.367-.406-.255-.659.112-.252.406-.366.66-.255l6.529 2.883c.252.111.367.406.255.659-.083.187-.267.298-.458.298zm2.497-2.997c-.127 0-.253-.048-.351-.144l-5.253-5.167c-.197-.193-.2-.51-.006-.707.193-.197.51-.2.707-.006l5.252 5.167c.197.193.199.51.006.707-.096.1-.226.15-.355.15zm-1.226 1.453c-.098 0-.195-.028-.281-.087l-6.235-4.241c-.229-.155-.288-.466-.132-.694.155-.229.467-.286.695-.132l6.235 4.241c.228.155.287.466.132.694-.097.143-.255.219-.414.219z"/></svg> \ No newline at end of file |