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/1f947.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/1f947.svg')
| -rw-r--r-- | public/emoji/1f947.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f947.svg b/public/emoji/1f947.svg index 94215a2d7..c67af77c6 100644 --- a/public/emoji/1f947.svg +++ b/public/emoji/1f947.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M28 0H8C5.042 0 2 5 3 7c1.612 3.225 12 13 12 13h6S31 10 33 7c1-2-2.333-7-5-7zm-4 8l-6 6-6-6c-.532-.532-.843-.919-.894-1.206C10.965 6.003 12.862 6 18 6c6.916 0 7.476.375 6.532 1.446-.147.168-.329.351-.532.554z"/><path fill="#3B88C3" d="M11.106 6.794C10.965 6.003 12.862 6 18 6c6.916 0 7.476.375 6.532 1.446C29.866 1.885 28.195 0 26 0H10c-3.579 0-1.01 4.097 1.106 6.794z"/><path fill="#FFAC33" d="M21.902 21.02c.06-.163.098-.337.098-.52 0-.828-.672-1.5-1.5-1.5h-5c-.829 0-1.5.672-1.5 1.5 0 .183.038.357.098.52C11.654 22.389 10 25 10 28c0 4.418 3.581 8 8 8 4.418 0 8-3.582 8-8 0-3-1.654-5.611-4.098-6.98z"/><path fill="#9E5200" d="M19.052 22.95h-1.291l-2.047 1.599c-.042.042-.084.154-.084.21v.884c0 .14.112.266.252.266h1.346v6.311c0 .141.112.267.267.267h1.557c.14 0 .252-.126.252-.267v-9.003c0-.141-.113-.267-.252-.267z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#55ACEE" d="M18 8l-7-8H0l14 17 11.521-4.75z"/><path fill="#3B88C3" d="M25 0l-7 8 5.39 7.312 1.227-1.489L36 0z"/><path fill="#FFAC33" d="M23.205 16.026c.08-.217.131-.448.131-.693 0-1.104-.896-2-2-2h-6.667c-1.105 0-2 .896-2 2 0 .245.05.476.131.693-3.258 1.826-5.464 5.307-5.464 9.307C7.335 31.224 12.111 36 18.002 36s10.667-4.776 10.667-10.667c0-4-2.206-7.481-5.464-9.307z"/><path fill="#9E5200" d="M19.404 18.6h-1.721l-2.73 2.132c-.056.056-.112.206-.112.28v1.178c0 .186.15.354.337.354h1.795v8.414c0 .188.15.355.355.355h2.076c.186 0 .336-.168.336-.355V18.954c0-.186-.149-.354-.336-.354z"/></svg> \ No newline at end of file |
