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/1f91a-1f3fd.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/1f91a-1f3fd.svg')
| -rw-r--r-- | public/emoji/1f91a-1f3fd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91a-1f3fd.svg b/public/emoji/1f91a-1f3fd.svg index 50698f1cf..6d85626e0 100644 --- a/public/emoji/1f91a-1f3fd.svg +++ b/public/emoji/1f91a-1f3fd.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M26 4.965C26 3.604 24.896 2.5 23.535 2.5h-.07C22.104 2.5 21 3.604 21 4.965v-2.16C21 1.532 19.968.5 18.695.5h-.391C17.032.5 16 1.532 16 2.805V4c0-1.381-1.119-2.5-2.5-2.5S11 2.619 11 4v9.347c0-1.02-.827-1.847-1.846-1.847h-.308C7.827 11.5 7 12.327 7 13.347v9.807C7 24.173 7.827 25 8.846 25H9v1h2.15c.695 3.424 3.721 6 7.35 6 4.143 0 7.5-3.357 7.5-7.5v-6c0-.217-.015-.431-.032-.643.013-.107.032-.211.032-.322V4.965z"/><path fill="#D5AB88" d="M30 8s0-2-2-2-2 2-2 2v9.286c-.319-.147-.651-.281-1-.398V4s0-2-2-2-2 2-2 2v12.122c-.328-.028-.661-.052-1-.069V2s0-2-2-2-2 2-2 2v14.052c-.342.017-.668.053-1 .082V3s0-2-2-2-2 2-2 2v18h-1v-8s0-2-2-2-2 2-2 2v11c0 6.627 5.373 12 12 12s12-5.373 12-12V8z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M15.5 2.965c1.381 0 2.5 1.119 2.5 2.5v.005L20.5.465c1.381 0 2.5 1.119 2.5 2.5V4.25l2.5-1.535c1.381 0 2.5 1.119 2.5 2.5V8.75L29 18H15.458L15.5 2.965z"/><path fill="#D5AB88" d="M4.625 16.219c1.381-.611 3.354.208 4.75 2.188.917 1.3 1.187 3.151 2.391 3.344.46.073 1.234-.313 1.234-1.397V4.5s0-2 2-2 2 2 2 2v11.633c0-.029 1-.064 1-.082V2s0-2 2-2 2 2 2 2v14.053c0 .017 1 .041 1 .069V4.25s0-2 2-2 2 2 2 2v12.638c0 .118 1 .251 1 .398V8.75s0-2 2-2 2 2 2 2V24c0 6.627-5.373 12-12 12-4.775 0-8.06-2.598-9.896-5.292C8.547 28.423 8.096 26.051 8 25.334c0 0-.123-1.479-1.156-2.865-1.469-1.969-2.5-3.156-3.125-3.866-.317-.359-.625-1.707.906-2.384z"/></svg> \ No newline at end of file |
