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/261d-1f3ff.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/261d-1f3ff.svg')
| -rw-r--r-- | public/emoji/261d-1f3ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/261d-1f3ff.svg b/public/emoji/261d-1f3ff.svg index a9aacf2b0..858849554 100644 --- a/public/emoji/261d-1f3ff.svg +++ b/public/emoji/261d-1f3ff.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#543226" d="M15.94 15.838c-.01-1.379 1.108-2.505 2.488-2.515 1.379-.01 2.423 1.1 2.433 2.479l-.006 4.303s1.844 11.797-5.428 11.797-8.414-8.673-8.414-8.673l-.025-2.241c-.01-1.29 8.952-5.15 8.952-5.15z"/><path fill="#7C533E" d="M20.936 16.957v-2.044c-.008-1.103-.909-1.991-2.012-1.983-1.103.008-1.991.909-1.983 2.012l.012 2.016h3.983zm2.593 2.684c-1.107 0-2.013-.906-2.013-2.013V4.712c0-1.107.906-2.013 2.013-2.013 1.107 0 2.013.906 2.013 2.013v12.916c0 1.107-.906 2.013-2.013 2.013zM9 23c-1.107 0-2.013-.906-2.013-2.013V17.01c0-1.107.906-2.013 2.013-2.013 1.107 0 2.013.906 2.013 2.013v3.977C11.012 22.094 10.106 23 9 23z"/><path fill="#543226" d="M13.193 22.033c-1.2 0-2.181-.982-2.181-2.181V15.54c0-1.2.982-2.181 2.181-2.181 1.2 0 2.181.982 2.181 2.181v4.311c0 1.2-.981 2.182-2.181 2.182zm14.773-1.889c-.013-1.814-1.494-3.274-3.308-3.261h-7.87l.013 6.992h7.907c1.814-.013 3.274-1.494 3.261-3.308l-.003-.423z"/><path fill="#7C533E" d="M13.93 12.965c1.103-.008 2.004.88 2.012 1.983v2.793c-.605.553-.969 1.324-.963 2.209.005.752.297 1.429.758 1.951-.336.619-.982 1.047-1.736 1.052-1.103.008-2.004-.88-2.012-1.983l-.043-5.993c-.007-1.103.881-2.004 1.984-2.012z"/><path fill="#7C533E" d="M27.873 19.273c-.39-1.145-1.422-1.403-1.921-1.399h-7.961c-1.107 0-2.013.906-2.013 2.013s.906 2.013 2.013 2.013l5.493-.003c.276-.002.501.229.503.505.002.276-.22.522-.496.522h-.125c-2.685 0-4.847 3.153-4.819 7.008.002.276-.22.482-.496.484-.276.002-.501-.22-.503-.496-.022-3.006 1.187-5.637 2.983-7.013l-2.534.018c-.999.007-1.273-.278-1.475-.391l.003.003c-.145.232-.922 1.416-2.516 1.416-1.723 0-2.37-1.154-2.494-1.335-.519.799-1.443 1.306-2.516 1.306-.714 0-1.529-.188-1.987-.731.146 6.662 5.541 11.759 12.07 11.712 5.708-.041 10.362-5.069 10.328-9.871-.098-2.659-1.537-5.761-1.537-5.761z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#583529" d="M26.992 19.016c-.255-.255-.799-.611-1.44-.962l-1.911-2-2.113 2h-.58l-2.509-3.634c-1.379.01-2.497 1.136-2.487 2.515l-3.556-2.112c-.817.364-1.389 1.18-1.389 2.133v.96l-4 4.168.016 2.185 9.984 10.729S27.525 19.71 27.55 19.74c-.129-.223-.513-.702-.558-.724z"/><g fill="#7C533E"><path d="M25.552 5.81c0-1.107-.906-2.013-2.013-2.013-1.107 0-2.013.906-2.013 2.013v12.245h4.025V5.81zm-4.605 12.244V16.01c-.008-1.103-.909-1.991-2.012-1.983-1.103.008-1.991.909-1.983 2.012l.012 2.016h3.983zM8.916 16h.168c1.059 0 1.916.858 1.916 1.917v4.166C11 23.142 10.143 24 9.084 24h-.168C7.857 24 7 23.142 7 22.083v-4.166C7 16.858 7.857 16 8.916 16zm6.918 2.96l-.056.062C15.304 19.551 15 20.233 15 21c0 .063.013.123.018.185.044.678.308 1.292.728 1.774-.071.129-.163.243-.259.353-.366.417-.89.688-1.487.688-1.104 0-2-.896-2-2v-6c0-.441.147-.845.389-1.176.364-.497.947-.824 1.611-.824 1.104 0 2 .896 2 2v2.778c-.061.055-.109.123-.166.182z"/><path d="M9.062 25c1.024 0 1.925-.526 2.45-1.322.123.183.271.346.431.497 1.185 1.115 3.034 1.044 4.167-.086.152-.152.303-.305.419-.488l-.003-.003C16.727 23.713 17 24 18 24h2.537c-.37.279-.708.623-1.024 1-1.228 1.467-2.013 3.606-2.013 6 0 .276.224.5.5.5s.5-.224.5-.5c0-2.548.956-4.775 2.377-6 .732-.631 1.584-1 2.498-1 .713.079.847-1 .125-1H18c-1.104 0-2-.896-2-2s.896-2 2-2h8c.858 0 1.66.596 1.913 1.415L29 24c.103.335.479 1.871.411 2.191C29.411 31 24.715 36 19 36c-6.537 0-11.844-5.231-11.986-11.734l.014.01c.515.445 1.176.724 1.91.724h.124z"/></g></svg> \ No newline at end of file |
