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/1f49e.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/1f49e.svg')
| -rw-r--r-- | public/emoji/1f49e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f49e.svg b/public/emoji/1f49e.svg index f61f1276c..b9459b7d5 100644 --- a/public/emoji/1f49e.svg +++ b/public/emoji/1f49e.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F2ABBA" d="M35.977 16.672c-.25 4.574-8.194 8.248-17.977 8.248-3.285 0-6.352-.422-9-1.145v3.588c2.65 1.023 5.718 1.619 9 1.619 9.941 0 18-5.373 18-12 0-.104-.02-.207-.023-.31zM27 6.6c-2.646-1.024-5.717-1.617-9-1.617-9.018 0-16.465 4.426-17.774 10.194C1.535 11.106 8.982 7.982 18 7.982c3.283 0 6.354.418 9 1.142V6.6z"/><path fill="#E75A70" d="M24.77 19.715c0-3.757-3.045-6.801-6.801-6.801-2.28 0-4.292 1.125-5.526 2.845-1.234-1.72-3.247-2.845-5.526-2.845-3.756 0-6.801 3.044-6.801 6.801 0 .531.067 1.049.183 1.545.945 5.867 7.468 12.059 12.144 13.758 4.675-1.699 11.2-7.891 12.142-13.756.117-.498.185-1.016.185-1.547zM35.885 5.693c0-2.602-2.109-4.711-4.711-4.711-1.579 0-2.973.78-3.828 1.972-.855-1.191-2.249-1.972-3.827-1.972-2.602 0-4.711 2.109-4.711 4.711 0 .369.047.727.127 1.07.654 4.064 5.173 8.353 8.411 9.529 3.238-1.177 7.758-5.465 8.412-9.528.08-.344.127-.702.127-1.071z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4ABBA" d="M35.977 16.672c-.25 4.574-8.194 8.248-17.977 8.248-3.285 0-6.352-.422-9-1.145v3.588c2.65 1.023 5.718 1.619 9 1.619 9.941 0 18-5.373 18-12 0-.104-.02-.207-.023-.31zM27 6.6c-2.646-1.024-5.717-1.617-9-1.617-9.018 0-16.465 4.426-17.774 10.194C1.535 11.106 8.982 7.982 18 7.982c3.283 0 6.354.418 9 1.142V6.6z"/><path fill="#DD2E44" d="M24.77 19.715c0-3.757-3.045-6.801-6.801-6.801-2.28 0-4.292 1.125-5.526 2.845-1.234-1.72-3.247-2.845-5.526-2.845-3.756 0-6.801 3.044-6.801 6.801 0 .531.067 1.049.183 1.545.945 5.867 7.468 12.059 12.144 13.758 4.675-1.699 11.2-7.891 12.142-13.756.117-.498.185-1.016.185-1.547zM35.885 5.693c0-2.602-2.109-4.711-4.711-4.711-1.579 0-2.973.78-3.828 1.972-.855-1.191-2.249-1.972-3.827-1.972-2.602 0-4.711 2.109-4.711 4.711 0 .369.047.727.127 1.07.654 4.064 5.173 8.353 8.411 9.529 3.238-1.177 7.758-5.465 8.412-9.528.08-.344.127-.702.127-1.071z"/></svg> \ No newline at end of file |
