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/1fa72.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/1fa72.svg')
| -rw-r--r-- | public/emoji/1fa72.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1fa72.svg b/public/emoji/1fa72.svg new file mode 100644 index 000000000..7486e6afe --- /dev/null +++ b/public/emoji/1fa72.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#2976AA" d="M36 17.96V10l-8.296-2H8.348L.052 10v7.96C.052 21.426 12.376 32 14.835 32h6.382C23.4 32 36 21.715 36 17.96z"/><g fill="#5DADEC"><path d="M4.617 18.577l-1.892-.647C4 14.201 4 10.904 4 9.32h2c0 1.692 0 5.213-1.383 9.257zm26.818.152C30 14.622 30 11.041 30 9.32h2c0 1.611 0 4.963 1.323 8.75l-1.888.659z"/><path d="M36 10H.052V8.199c0-.735.596-1.331 1.331-1.331h33.286c.735 0 1.331.596 1.331 1.331V10z"/></g><path d="M3.702 18.154l-.03.099c.011-.033.018-.065.03-.099-1.464-.547-2.75-.865-3.649-1.019v.825C.052 21.426 12.409 32 14.854 32h.934c-1.155-8.143-7.473-12.122-12.086-13.846zM36 17.96v-.747c-.897.147-2.196.459-3.677 1.005.021.061.035.12.057.181-.021-.061-.036-.12-.057-.181-4.6 1.696-10.905 5.635-12.059 13.782h.934C23.369 32 36 21.715 36 17.96z" fill="#1D567C"/></svg> \ No newline at end of file |