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/1f9b1.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/1f9b1.svg')
| -rw-r--r-- | public/emoji/1f9b1.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b1.svg b/public/emoji/1f9b1.svg new file mode 100644 index 000000000..414422b83 --- /dev/null +++ b/public/emoji/1f9b1.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFDC5D" d="M0 21h30v15H0z"/><path fill="#FFAC33" d="M35 26.417c0-1.812-.954-3.39-2.381-4.29.216-.563.348-1.169.348-1.81 0-2.595-1.95-4.709-4.459-5.02.239-.657.392-1.357.392-2.097 0-3.369-2.731-6.1-6.1-6.1-.803 0-1.566.165-2.267.447-.704-2.595-3.05-4.514-5.866-4.514-1.769 0-3.347.765-4.461 1.966C9.347 2.669 7.127 1 4.5 1 2.704 1 1.111 1.792 0 3.03v27.447c1.289.645 2.834 1.023 4.5 1.023 2.635 0 4.955-.956 6.44-2.414.968 2.56 4.071 4.447 7.794 4.447 2.188 0 4.166-.655 5.626-1.71.4 1.394.511 2.668.542 4.177h6.948c.688-.911 1.117-2.131 1.117-3.483 0-.653-.108-1.271-.285-1.842C34.075 29.768 35 28.202 35 26.417z"/></svg> \ No newline at end of file |