Diff - 15042d5b319b8eff15f3e3de257444db2d64dfe8^2..15042d5b319b8eff15f3e3de257444db2d64dfe8 - 3p/tock/libtock-rs - Git at Google

commit: 15042d5b319b8eff15f3e3de257444db2d64dfe8
[log]
author: Woyten <woyten.tielesch@online.de>
Mon Apr 06 19:41:23 2020 +0200
committer: GitHub <noreply@github.com>
Mon Apr 06 19:41:23 2020 +0200
tree: e7c26e7bc6d20e5dee59908ce492b63f14fd3ad5
parent: 6fc45ef936e5e0e3fcee18fb1d85444191993578 [diff]
parent: 9c9cb5263b50891bca710cf6ff95a0f710f7ae49 [diff]

Merge pull request #170 from torfmaster/feature/libcore-futures

bors is causing trouble. Merging manually...