diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f640.svg | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'public/emoji/1f640.svg')
| -rw-r--r-- | public/emoji/1f640.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f640.svg b/public/emoji/1f640.svg index c071e39ff..65ea8a5a2 100644 --- a/public/emoji/1f640.svg +++ b/public/emoji/1f640.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M34.964 11.955L35 12s1-10 0-11c-.91-.91-6.771.66-7.822.951C24.752.717 21.735 0 18 0c-3.729 0-6.742.719-9.166 1.954C7.814 1.671 1.913.087 1 1 0 2 1 12 1 12l.047-.059C.308 14.494 0 17.251 0 20c0 5.506 3.376 9.818 7.577 12.572C7.658 26.155 5.32 19 1.404 19c-.464 0-.84.066-1.153.183C.554 18.426 1.211 18 2.44 18c4.246 0 6.638 8.411 6.102 15.173C11.688 35.01 15.171 36 18 36c2.83 0 6.315-.981 9.461-2.812-.546-6.79 1.848-15.188 6.1-15.188 1.233 0 1.892.426 2.192 1.183-.314-.117-.691-.183-1.157-.183-3.924 0-6.264 7.151-6.171 13.592C32.624 29.847 36 25.538 36 20c0-2.751-.306-5.502-1.036-8.045z"/><path fill="#292F33" d="M18 21c-2.209 0-4 1.791-4 4v6c0 2.209 1.791 4 4 4s4-1.791 4-4v-6c0-2.209-1.791-4-4-4z"/><path fill="#67757F" d="M18 15c3 0 3 .5 3 1.5s-1.5 3-3 3-3-2-3-3-.001-1.5 3-1.5z"/><path fill="#9AAAB4" d="M29.924 20.506l-5.021 1.004c-.271.054-.447.317-.392.588.048.238.256.402.489.402.033 0 .066-.003.099-.01l4.197-.84c.195-.409.405-.792.628-1.144zM33.561 18l.016.001 1.582-.527c.262-.087.403-.37.316-.632-.088-.262-.369-.403-.633-.316l-9 3c-.262.088-.403.371-.316.633.07.208.265.341.474.341.053 0 .105-.008.158-.025l5.431-1.81c.602-.424 1.261-.665 1.972-.665zm-22.463 3.51L6.07 20.504c.223.354.433.736.629 1.146l4.203.841c.033.007.066.01.099.01.233 0 .442-.164.49-.402.053-.272-.122-.536-.393-.589zm-.94-1.985l-9-3c-.264-.088-.545.054-.632.316-.087.262.054.545.316.632l1.583.528c.006.001.01-.001.015-.001.708 0 1.363.24 1.963.661l5.438 1.813c.053.018.107.026.159.026.21 0 .404-.133.474-.342.087-.262-.054-.545-.316-.633z"/><path fill="#F5F8FA" d="M7.347 10.665c-.946 3.176.107 6.293 2.352 6.962 2.246.67 4.834-1.362 5.779-4.538.947-3.175-.106-6.293-2.35-6.962-2.245-.669-4.834 1.364-5.781 4.538zm21.305 0c.946 3.176-.107 6.293-2.352 6.962-2.246.67-4.834-1.362-5.779-4.538-.946-3.175.107-6.293 2.351-6.962 2.245-.669 4.833 1.364 5.78 4.538z"/><path fill="#FCAB40" d="M35.753 19.183c-.314-.117-.691-.183-1.157-.183-4.641 0-7.065 10.002-5.873 17h6.46c-1.906-7.045 1.656-14.089.57-16.817zM1.404 19c-.464 0-.84.066-1.153.183.072-.179.167-.336.281-.476C-1.33 20.998 2.849 28.54.818 36h6.46c1.19-6.96-1.235-17-5.874-17z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M35 .3C34.326-.946 27.596 1.988 25 4c0 0-4-.998-7-.998S11 4 11 4C8.404 1.988 1.674-.946 1 .3-1 4 2 13 2 13 1.102 14.796.709 16.328.377 18.987c.353-.097.76-.157 1.265-.157 5.002 0 7.857 8.145 7.352 14.925C12.541 35.401 16.458 36 18 36c1.549 0 5.497-.605 9.058-2.27-.497-6.775 2.357-14.9 7.353-14.9.48 0 .868.058 1.21.145C35.29 16.323 34.897 14.793 34 13c0 0 3-9 1-12.7z"/><path fill="#E75A70" d="M18 15c3 0 3 .5 3 1.5s-1.5 3-3 3-3-2-3-3-.001-1.5 3-1.5z"/><path fill="#F18F26" d="M2 3c.447-1.342 5.64 1 6.64 2C8.64 5 4 8 3 11c0 0-2-5-1-8zm32 0c-.447-1.342-5.64 1-6.64 2 0 0 4.64 3 5.64 6 0 0 2-5 1-8z"/><path fill="#FFCC4D" d="M4.934 5.603C4.934 4.189 11 7 10 8s-2 1.603-3 2.603-2.066-4-2.066-5zm26.132 0C31.066 4.189 25 7 26 8s2 1.603 3 2.603 2.066-4 2.066-5z"/><path fill="#FEE7B8" d="M11.039 21.502c-1.801-.14-3.389-.016-4.762.234.198.292.386.6.565.924 1.208-.193 2.586-.279 4.12-.162.28.041.516-.184.537-.46.02-.275-.185-.516-.46-.536zm-1.321-2.143c-4.002-1.25-7.396-.772-8.742-.488.206-.024.421-.042.666-.042.889 0 1.71.26 2.457.722 1.482-.021 3.326.14 5.321.764.049.016.1.022.149.022.213 0 .41-.137.477-.351.083-.263-.064-.544-.328-.627zm20.053 2.386c-1.384-.256-2.988-.384-4.809-.243-.275.02-.481.261-.46.536.021.275.257.501.537.46 1.554-.118 2.95-.03 4.17.169.177-.323.364-.631.562-.922zm2.183-2.194c.747-.462 1.568-.722 2.458-.722.216 0 .403.018.589.037-1.361-.284-4.739-.75-8.718.493-.264.083-.411.363-.328.627.067.214.264.351.477.351.049 0 .1-.007.149-.022 2.018-.632 3.883-.79 5.373-.764z"/><path fill="#292F33" d="M18 21c-2.209 0-4 1.791-4 4v6c0 2.209 1.791 4 4 4s4-1.791 4-4v-6c0-2.209-1.791-4-4-4z"/><path fill="#F5F8FA" d="M7.347 10.665c-.946 3.176.107 6.293 2.352 6.962 2.246.67 4.834-1.362 5.779-4.538.947-3.175-.106-6.293-2.35-6.962-2.245-.669-4.834 1.364-5.781 4.538zm21.305 0c.946 3.176-.107 6.293-2.352 6.962-2.246.67-4.834-1.362-5.779-4.538-.946-3.175.107-6.293 2.351-6.962 2.245-.669 4.833 1.364 5.78 4.538z"/><path fill="#FCAB40" d="M35.753 19.183c-.314-.117-.691-.183-1.157-.183-4.641 0-7.065 10.002-5.873 17h6.46c-1.906-7.045 1.656-14.089.57-16.817zM1.404 19c-.464 0-.84.066-1.153.183l-.001.014C-.832 21.94 2.722 29.006.818 36h6.46c1.19-6.96-1.235-17-5.874-17z"/></svg> \ No newline at end of file |
