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/1f6b6.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/1f6b6.svg')
| -rw-r--r-- | public/emoji/1f6b6.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6b6.svg b/public/emoji/1f6b6.svg index c82bdf756..9217939d2 100644 --- a/public/emoji/1f6b6.svg +++ b/public/emoji/1f6b6.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M15.012 3.254c-1.207.267 1.054 1.529.684 2.739-.252.838.225 0 1 0 0 0 .627 1.283.423 3.226-.207 1.94 2.472 2.616 2.677.673.204-1.941-1.385-2.988-.511-4.5 2.092-3.619-4.273-2.138-4.273-2.138"/><path fill="#FFDC5D" d="M20.567 5.975c.929-1.996.212-4.298-1.602-5.143-1.814-.845-4.769-.077-5.238 2.073-.466 2.136-.03 5.389 1.877 5.299.527-.025 1.057-.067 1.571-.149.067.25.052.761-.043 1.246-.369 1.864 2.171 2.751 2.539.883.214-1.093-.195-1.942-.373-2.737.516-.343.96-.808 1.269-1.472z"/><path fill="#FFAC33" d="M21.043 1.71C19.894.186 18.228-.519 15.243.431c-2.607.829-1.788 3.076-1.297 2.594.782-.768 1.757-.458 1.757-.458l.632 2.315s.353.242.553-.52c.199-.762 1.239-.778 1.541-.137.469.996-.233 1.139-.331 1.711-.31 1.81 1.713 1.864 1.713 1.864s.383.178 1.135-1.103c.753-1.283 1.238-3.473.097-4.987z"/><path fill="#F9CA55" d="M23.696 20.993c-.553 0-1-.447-1-1 0-4.52-4.661-9.247-4.707-9.294-.39-.391-.389-1.024.001-1.414.391-.39 1.023-.389 1.413.001.216.216 5.293 5.355 5.293 10.708 0 .552-.447.999-1 .999z"/><path fill="#2A6797" d="M15.696 34.993c-1.104 0-2-.896-2-2v-7c0-.348.091-.69.264-.992l4-7c.548-.958 1.771-1.293 2.729-.744.959.548 1.292 1.77.744 2.729l-3.736 6.539v6.469c-.001 1.104-.897 1.999-2.001 1.999z"/><path fill="#4289C1" d="M24.697 31.993c-.587 0-1.168-.257-1.562-.751l-4-5c-.2-.249-.337-.543-.399-.856l-1-5c-.217-1.083.485-2.137 1.568-2.354 1.088-.219 2.138.486 2.354 1.568l.905 4.524 3.695 4.62c.691.862.551 2.121-.312 2.811-.369.295-.811.438-1.249.438z"/><path fill="#77B255" d="M22.696 18.993s0 1-2 1h-4c-2-6-.359-12 2-12 3 0 3 4 4 9"/><path fill="#FFDC5D" d="M17.696 11.991c0 .045-.066 4.552-3.6 7.203l.01.014c-.243.183-.41.459-.41.786 0 .553.448 1 1 1 .225 0 .423-.088.59-.214l.01.014c4.35-3.262 4.4-8.575 4.4-8.8l-2-.003z"/><path fill="#292F33" d="M27.878 31.049c.271-.271.16-.676-.129-.94-.463-.422-.672-.574-.672-.574-.255-.168-.873-.418-1.13-.161-1.872 1.865-3.304 4.53-3.356 5.459-.031.548.645.855 1.029.471 1.132-1.133 3.276-3.275 4.258-4.255zm-10.266 4.854c.383.003.594-.361.578-.753-.025-.626-.064-.882-.064-.882-.059-.3-.316-.915-.68-.918-2.642-.023-5.545.83-6.243 1.446-.412.363-.156 1.06.388 1.063 1.603.013 4.633.034 6.021.044z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M18.011 34.975l-.052.016c.018-.068.042-.19.042-.383 0-.303-.156-.869-.199-.95s-.09-.139-.194-.11c-.079.022-.685.326-1.072.341-.719.027-1.066-.618-1.066-.618s-.399.228-.716.413c-.318.185-.687.462-.959.627-.232.141-.497.208-.771.243s-.497.023-.563.029c-.066.006-.621-.061-.641.488l.003.127-.054-.026s-.048.17-.052.202c-.004.033-.024.052.046.096.07.044.378.176.77.274s1.028.243 1.519.243.909-.098 1.151-.156c.243-.058.763-.169.813-.146.05.023.116.191.173.243.058.052 1.61-.081 1.721-.104.112-.023.146-.119.146-.162v-.649c.002-.027-.021-.045-.045-.038zm10.947-3.752l-.504-.429c-.019-.016-.048-.011-.059.012l-.022.051c-.041-.059-.12-.158-.269-.285-.235-.2-.777-.454-.868-.473-.091-.02-.167-.022-.213.077-.035.076-.199.746-.444 1.056-.454.575-1.184.418-1.184.418l-.153.828c-.067.368-.096.838-.148 1.158-.044.273-.167.523-.322.758-.154.236-.31.4-.35.456-.039.055-.457.441-.045.82l.101.081-.055.025s.1.149.122.174c.022.025.025.053.104.028s.386-.177.721-.416c.336-.24.868-.637 1.192-1.018.325-.381.524-.77.64-.996.116-.226.373-.703.424-.727.051-.024.224.036.303.026.078-.01 1.001-1.302 1.057-1.403s.005-.193-.028-.221z"/><path fill="#F9CA55" d="M19.3 12.243c.927.96 3.062 2.89 3.109 3.121.251 1.223.614 2.606.52 3.454-.068.615.376 1.298.551 1.583.218.354.781.898 1.141.86.224-.023.567-.43.384-.636-.357-.4-.298-1.009-.522-1.559-.449-1.105-.045-3.194-.661-4.563-.256-.567-.733-1.693-2.824-3.626-.511.462-1.698 1.366-1.698 1.366z"/><path fill="#FFDC5D" d="M19.005 1.384c-1.593-.627-4.077.182-4.365 2.043-.287 1.848.239 4.747 1.863 4.572 1.702-.184 3.448-.554 4.138-2.307s-.043-3.681-1.636-4.308z"/><path fill="#FFDC5D" d="M20.189 6.143c2.318-2.723-3.266-2.458-3.266-2.458-1.057.038-.329 1.799-.827 2.761-.341.665 1.095 1.018 1.095 1.018s.659-.01.694.79v.007c.008.204-.013.445-.108.769-.473 1.601 1.677 2.582 2.149.978.187-.635.114-1.193.02-1.708l-.009-.046c-.144-.766-.322-1.437.252-2.111z"/><path fill="#FFAC33" d="M20.825 2.026c-1.061-1.242-2.58-1.901-5.019-.791-.994.452-1.439.285-1.58.484-.679.953.246 2.01.608 1.799 1.148-.669 2.183-.47 2.447.014s.021 1.354.234 1.359c.579.015.485-.552.714-.878.375-.534.946-.232 1.071.362.099.471 0 1.271-.77 1.412.523 1.151 1.56 1.502 1.56 1.502s.337.132.912-1.001c.576-1.134.877-3.029-.177-4.262z"/><path fill="#2A6797" d="M16.062 34.203c-1.266.109-1.853-.233-1.721-.416.165-.228.128-.397.13-.536C14.499 30.81 14 27.26 14 27.26c0-.348.003-.813.312-1.562.778-1.883 3.951-7.69 3.951-7.69.548-.958 1.771-1.293 2.729-.744.959.548 1.122 1.405.744 2.729-.715 2.508-2.965 5.602-3.903 7.477.224 2.121-.174 3.853.035 5.857.03.288-.54.767-1.806.876z"/><path fill="#4289C1" d="M26.797 31.931c-.364.553-.97.942-1.598.838-1.269-1.924-4.955-5.321-4.955-5.321-.241-.25-.562-.587-.86-1.341-.748-1.895-2.498-8.277-2.498-8.277-.272-1.07.376-2.16 1.446-2.43 1.07-.272 1.783.232 2.43 1.446 1.227 2.301 1.757 6.09 2.384 8.09 1.87 1.568 2.383 3.603 4.275 5.151-.065.857-.26 1.291-.624 1.844z"/><path fill="#77B255" d="M23 20s0 1-2 1h-4.898c-.415-2-.027-5.004.006-7.765.043-3.623 2.298-5.609 3.71-5.155 1.846.594 2.693 2.641 2.932 5.858S23 20 23 20z"/><path fill="#FFDC5D" d="M17.75 11.792c-.167 1.399-.322 4.433-.479 4.625-.833 1.021-1.722 2.24-2.479 2.729-.549.354-.811 1.174-.927 1.507-.144.414-.213 1.238.057 1.507.169.168.73.177.776-.11.09-.559.626-.917.927-1.467.604-1.104 2.583-2.167 3.292-3.584.294-.588.896-1.729 1.083-4.729-.72-.11-2.25-.478-2.25-.478z"/></svg> \ No newline at end of file |
