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/1fa92.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/1fa92.svg')
| -rw-r--r-- | public/emoji/1fa92.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1fa92.svg b/public/emoji/1fa92.svg new file mode 100644 index 000000000..3b261c90f --- /dev/null +++ b/public/emoji/1fa92.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#77B255" d="M8.53 21.304L21.304 8.53c1.451-1.451 1.451-3.825 0-5.276l-1.666-1.666c-1.451-1.451-3.825-1.451-5.276 0L1.588 14.362c-1.451 1.451-1.451 3.825 0 5.276l1.666 1.666c1.451 1.45 3.825 1.45 5.276 0z"/><path fill="#77B255" d="M34.355 34.355c1.145-1.145 1.145-3.02 0-4.165L14.917 10.752c-1.145-1.145-3.02-1.145-4.165 0s-1.145 3.02 0 4.165L30.19 34.355c1.145 1.145 3.019 1.145 4.165 0z"/><path fill="#5C913B" d="M24.551 18.998l9.803 9.803c1.527 1.527 1.527 4.026 0 5.554-1.527 1.527-4.026 1.527-5.554 0l-9.803-9.803c-1.534-1.534-1.534-4.02 0-5.554 1.534-1.534 4.021-1.534 5.554 0z"/><path fill="#E1E8ED" d="M5.198 17.694L17.694 5.198c.382-.382.382-1.007 0-1.388-.382-.382-1.007-.382-1.388 0L3.81 16.305c-.382.382-.382 1.007 0 1.388.381.382 1.006.382 1.388.001zm2.083 2.082L19.776 7.281c.382-.382.382-1.007 0-1.388-.382-.382-1.007-.382-1.388 0L5.892 18.388c-.382.382-.382 1.007 0 1.388.382.382 1.007.382 1.389 0z"/><path fill="#5C913B" d="M18.388 14.223l-4.165 4.166-1.39-1.39L17 12.835z"/><path fill="#3E721D" d="M23.594 25.677l2.083-2.083c.573-.573.573-1.51 0-2.083-.573-.573-1.51-.573-2.083 0l-2.083 2.083c-.573.573-.573 1.51 0 2.083.574.573 1.511.573 2.083 0zm3.471 3.471l2.083-2.083c.573-.573.573-1.51 0-2.083-.573-.573-1.51-.573-2.083 0l-2.083 2.083c-.573.573-.573 1.51 0 2.083.574.573 1.511.573 2.083 0zm3.471 3.471l2.083-2.083c.573-.573.573-1.51 0-2.083-.573-.573-1.51-.573-2.083 0l-2.083 2.083c-.573.573-.573 1.51 0 2.083.574.573 1.511.573 2.083 0z"/><path fill="#A6D388" d="M3.472 15.255L15.255 3.472c.58-.58.58-1.521 0-2.101l-.338-.338L1.033 14.917l.338.338c.58.58 1.521.58 2.101 0z"/></svg> \ No newline at end of file |