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/1f3b0.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/1f3b0.svg')
| -rw-r--r-- | public/emoji/1f3b0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3b0.svg b/public/emoji/1f3b0.svg index af46ef62e..789fd08d1 100644 --- a/public/emoji/1f3b0.svg +++ b/public/emoji/1f3b0.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="#CCD6DD" d="M11 24c0 2.209-.791 3-3 3H4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12zm12 0c0 2.209-.791 3-3 3h-4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12zm12 0c0 2.209-.791 3-3 3h-4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12z"/><path fill="#E1E8ED" d="M1 13h10v10H1zm12 0h10v10H13zm12 0h10v10H25z"/><path fill="#BE1931" d="M30.795 15.685h-2.816c-.594 0-.813-.385-.813-.759 0-.385.209-.759.813-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726l-2.729 5.545c-.308.615-.429.836-.925.836-.604 0-.912-.463-.912-.781 0-.133.033-.232.109-.385l2.751-5.215zm-12 0h-2.816c-.594 0-.814-.385-.814-.759 0-.385.209-.759.814-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726l-2.729 5.545c-.308.615-.429.836-.924.836-.605 0-.913-.463-.913-.781 0-.133.033-.232.11-.385l2.75-5.215zm-12 0H3.979c-.594 0-.814-.385-.814-.759 0-.385.209-.759.814-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726L5.772 21.23c-.308.615-.429.836-.924.836-.605 0-.913-.463-.913-.781 0-.133.033-.232.11-.385l2.75-5.215z"/><path fill="#9266CC" d="M3.061 9c-.04.162-.061.329-.061.5C3 10.881 4.343 12 6 12s3-1.119 3-2.5c0-.171-.021-.338-.061-.5H3.061zm12 0c-.04.162-.061.329-.061.5 0 1.381 1.343 2.5 3 2.5 1.656 0 3-1.119 3-2.5 0-.171-.021-.338-.06-.5h-5.879zM27.06 9c-.039.162-.06.329-.06.5 0 1.381 1.344 2.5 3 2.5s3-1.119 3-2.5c0-.171-.021-.338-.061-.5H27.06z"/><path fill="#F4900C" d="M8.816 27c.112-.157.184-.324.184-.5 0-.828-1.343-1.5-3-1.5s-3 .672-3 1.5c0 .176.072.343.184.5h5.632zm12 0c.112-.157.184-.324.184-.5 0-.828-1.344-1.5-3-1.5-1.657 0-3 .672-3 1.5 0 .176.072.343.184.5h5.632zm12 0c.112-.157.184-.324.184-.5 0-.828-1.344-1.5-3-1.5s-3 .672-3 1.5c0 .176.072.343.184.5h5.632z"/></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="#CCD6DD" d="M11 24c0 2.209-.791 3-3 3H4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12zm12 0c0 2.209-.791 3-3 3h-4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12zm12 0c0 2.209-.791 3-3 3h-4c-2.209 0-3-.791-3-3V12c0-2.209.791-3 3-3h4c2.209 0 3 .791 3 3v12z"/><path fill="#E1E8ED" d="M1 13h10v10H1zm12 0h10v10H13zm12 0h10v10H25z"/><path fill="#BE1931" d="M30.795 15.685h-2.816c-.594 0-.813-.385-.813-.759 0-.385.209-.759.813-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726l-2.729 5.545c-.308.615-.429.836-.925.836-.604 0-.912-.463-.912-.781 0-.133.033-.232.109-.385l2.751-5.215zm-12 0h-2.816c-.594 0-.814-.385-.814-.759 0-.385.209-.759.814-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726l-2.729 5.545c-.308.615-.429.836-.924.836-.605 0-.913-.463-.913-.781 0-.133.033-.232.11-.385l2.75-5.215zm-12 0H3.979c-.594 0-.814-.385-.814-.759 0-.385.209-.759.814-.759h3.983c.561 0 .792.506.792.792 0 .22-.121.451-.253.726L5.772 21.23c-.308.615-.429.836-.924.836-.605 0-.913-.463-.913-.781 0-.133.033-.232.11-.385l2.75-5.215z"/><path fill="#9266CC" d="M3.061 9c-.04.162-.061.329-.061.5C3 10.881 4.343 12 6 12s3-1.119 3-2.5c0-.171-.021-.338-.061-.5H3.061zm12 0c-.04.162-.061.329-.061.5 0 1.381 1.343 2.5 3 2.5 1.656 0 3-1.119 3-2.5 0-.171-.021-.338-.06-.5h-5.879zM27.06 9c-.039.162-.06.329-.06.5 0 1.381 1.344 2.5 3 2.5s3-1.119 3-2.5c0-.171-.021-.338-.061-.5H27.06z"/><path fill="#F4900C" d="M8.816 27c.112-.157.184-.324.184-.5 0-.828-1.343-1.5-3-1.5s-3 .672-3 1.5c0 .176.072.343.184.5h5.632zm12 0c.112-.157.184-.324.184-.5 0-.828-1.344-1.5-3-1.5-1.657 0-3 .672-3 1.5 0 .176.072.343.184.5h5.632zm12 0c.112-.157.184-.324.184-.5 0-.828-1.344-1.5-3-1.5s-3 .672-3 1.5c0 .176.072.343.184.5h5.632z"/></svg> \ No newline at end of file |
