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/1f4df.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/1f4df.svg')
| -rw-r--r-- | public/emoji/1f4df.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4df.svg b/public/emoji/1f4df.svg index f4f240fdb..d7d4b5fa5 100644 --- a/public/emoji/1f4df.svg +++ b/public/emoji/1f4df.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#C6E5B3" d="M34 21c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h28c1.104 0 2 .896 2 2v12z"/><path fill="#66757F" d="M14 27c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2s.896-2 2-2h8c1.104 0 2 .896 2 2zm14 0c0 1.104-.896 2-2 2h-8c-1.104 0-2-.896-2-2s.896-2 2-2h8c1.104 0 2 .896 2 2z"/><circle fill="#DD2E44" cx="32" cy="27" r="2"/><path d="M24.616 16.138c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506h-1.433zm1.433-2.444h-.012l-.803 1.659h.815v-1.659zm-5.744 1.171c0-.961.372-2.17 1.563-2.17 1.192 0 1.563 1.209 1.563 2.17s-.372 2.171-1.563 2.171c-1.191 0-1.563-1.209-1.563-2.171zm2.206 0c0-.448-.041-1.368-.643-1.368s-.643.92-.643 1.368c0 .419.041 1.368.643 1.368.602.001.643-.949.643-1.368zm-5.781 1.201c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506H16.73zm1.433-2.444h-.012l-.803 1.659h.815v-1.659zm-5.744 1.315c0-.961.372-2.17 1.563-2.17 1.192 0 1.563 1.209 1.563 2.17s-.372 2.171-1.563 2.171c-1.191-.001-1.563-1.21-1.563-2.171zm2.206 0c0-.448-.041-1.368-.643-1.368s-.643.92-.643 1.368c0 .419.041 1.368.643 1.368s.643-.95.643-1.368zm-5.781 1.201c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506H8.844zm1.433-2.444h-.012l-.803 1.659h.815v-1.659z" fill="#77B255"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#31373D" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#C6E5B3" d="M34 21c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2V9c0-1.104.896-2 2-2h28c1.104 0 2 .896 2 2v12z"/><path fill="#66757F" d="M14 27c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2s.896-2 2-2h8c1.104 0 2 .896 2 2zm14 0c0 1.104-.896 2-2 2h-8c-1.104 0-2-.896-2-2s.896-2 2-2h8c1.104 0 2 .896 2 2z"/><circle fill="#DD2E44" cx="32" cy="27" r="2"/><path d="M24.616 16.138c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506h-1.433zm1.433-2.444h-.012l-.803 1.659h.815v-1.659zm-5.744 1.171c0-.961.372-2.17 1.563-2.17 1.192 0 1.563 1.209 1.563 2.17s-.372 2.171-1.563 2.171c-1.191 0-1.563-1.209-1.563-2.171zm2.206 0c0-.448-.041-1.368-.643-1.368s-.643.92-.643 1.368c0 .419.041 1.368.643 1.368.602.001.643-.949.643-1.368zm-5.781 1.201c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506H16.73zm1.433-2.444h-.012l-.803 1.659h.815v-1.659zm-5.744 1.315c0-.961.372-2.17 1.563-2.17 1.192 0 1.563 1.209 1.563 2.17s-.372 2.171-1.563 2.171c-1.191-.001-1.563-1.21-1.563-2.171zm2.206 0c0-.448-.041-1.368-.643-1.368s-.643.92-.643 1.368c0 .419.041 1.368.643 1.368s.643-.95.643-1.368zm-5.781 1.201c-.291 0-.416-.196-.416-.351 0-.131.048-.202.083-.262l1.332-2.414c.131-.238.297-.345.606-.345.345 0 .684.22.684.761v1.826h.101c.232 0 .416.155.416.393 0 .238-.184.392-.416.392h-.101v.506c0 .315-.125.464-.428.464s-.428-.149-.428-.464v-.506H8.844zm1.433-2.444h-.012l-.803 1.659h.815v-1.659z" fill="#77B255"/></svg> \ No newline at end of file |
