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/1f949.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/1f949.svg')
| -rw-r--r-- | public/emoji/1f949.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f949.svg b/public/emoji/1f949.svg index 3e56363e7..6bb5f773c 100644 --- a/public/emoji/1f949.svg +++ b/public/emoji/1f949.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="#FF8A3B" 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="#7C4119" d="M15.089 31.013l.884-.884c.098-.099.238-.112.351-.028 0 0 .869.646 1.542.646.604 0 1.221-.505 1.221-1.122s-.632-1.136-1.669-1.136h-.479c-.14 0-.266-.126-.266-.267v-1.164c0-.154.126-.267.266-.267h.479c.981 0 1.5-.477 1.5-1.079 0-.604-.519-1.052-1.122-1.052-.617 0-1.01.322-1.22.561-.099.112-.267.112-.378.015l-.855-.842c-.113-.099-.099-.267 0-.364 0 0 1.149-1.234 2.678-1.234 1.627 0 3.029.996 3.029 2.566 0 1.079-.813 1.879-1.444 2.173v.043c.659.28 1.696 1.149 1.696 2.355 0 1.528-1.332 2.679-3.268 2.679-1.766 0-2.664-.87-2.958-1.248-.086-.099-.071-.254.013-.351z"/></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="#FF8A3B" 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="#7C4119" d="M14.121 29.35l1.178-1.178c.13-.132.318-.15.467-.038 0 0 1.159.861 2.056.861.805 0 1.628-.673 1.628-1.496s-.842-1.514-2.225-1.514h-.639c-.186 0-.354-.168-.354-.355v-1.552c0-.206.168-.355.354-.355h.639c1.309 0 2-.635 2-1.439 0-.805-.691-1.402-1.496-1.402-.823 0-1.346.43-1.626.747-.132.15-.355.15-.504.02l-1.141-1.122c-.151-.132-.132-.355 0-.486 0 0 1.533-1.646 3.57-1.646 2.169 0 4.039 1.328 4.039 3.422 0 1.439-1.085 2.505-1.926 2.897v.057c.879.374 2.262 1.533 2.262 3.141 0 2.038-1.776 3.572-4.357 3.572-2.354 0-3.552-1.16-3.944-1.664-.113-.134-.093-.34.019-.47z"/></svg> \ No newline at end of file |
