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/1f9be.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/1f9be.svg')
| -rw-r--r-- | public/emoji/1f9be.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9be.svg b/public/emoji/1f9be.svg new file mode 100644 index 000000000..c3d2db4f0 --- /dev/null +++ b/public/emoji/1f9be.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#66757F" cx="8.553" cy="29.973" r="4.478"/><path fill="#CCD6DD" d="M10.482 34.451c5.29 2 17 1 20-1s5.658-4.054 5-8c-1-6-9-7-14-6-4.903.981-9 4-10 6-.632 1.265 0 3 0 5 0 3-1.936 3.646-1 4z"/><path fill="#99AAB5" d="M30.482 33.451c3-2 5.658-4.054 5-8l-.005-.02c-2.609 1.493-6.824 3.435-12.309 4.37-4.599.784-8.938.861-11.692.798-.064 2.869-1.913 3.505-.994 3.852 5.29 2 17 1 20-1z"/><circle fill="#66757F" cx="8.489" cy="9.789" r="2.42"/><path fill="#99AAB5" d="M2.495 31.311c-3.926-5.609-1.447-12.69.586-17.247 1.559-3.495 3.025-4.696 3.025-4.696l4.557 2.033s-1.724 4.645-1.192 8.237c.561 3.786 1.227 6.976-.596 10.341s-5.399 2.734-6.38 1.332z"/><path fill="#CCD6DD" d="M7.952 10.192l2.711 1.21s-1.724 4.645-1.192 8.237c.561 3.786 1.227 6.976-.596 10.341-.754 1.392-1.808 2.1-2.855 2.353-4.436-9.786 1.932-22.141 1.932-22.141z"/><path fill="#99AAB5" d="M6.316 8.176C6.737 5.792 10.172.254 11.364.464s6.94 2.454 7.922 3.856-1.052 5.959-2.244 5.749c-1.192-.21-.771-2.594-.771-2.594s.21-1.192-1.192-.21l-2.804 1.963c-1.402.982-5.959-1.052-5.959-1.052z"/><path fill="#99AAB5" d="M6.316 8.176c-.981-1.402-.35-4.978-.14-6.169.21-1.192 2.594-.771 2.173 1.613-.42 2.383.771 2.594.771 2.594L6.316 8.176z"/><path fill="#CCD6DD" d="M6.316 8.176C6.737 5.792 10.172.254 11.364.464s6.94 2.454 7.922 3.856c-5.749-2.244-7.782 2.313-8.192 5.174-1.886-.027-4.778-1.318-4.778-1.318z"/></svg> \ No newline at end of file |