Merge remote-tracking branch 'origin/feature/15292-usb-image' into feature/15292...
commit63323a6cf3897166087750119dce4883e4076112
authorsajolida <sajolida@pimienta.org>
Tue, 15 Jan 2019 20:22:46 +0000 (15 20:22 +0000)
committersajolida <sajolida@pimienta.org>
Tue, 15 Jan 2019 20:22:46 +0000 (15 20:22 +0000)
tree9a236efad673e27fd173991688eefe86ea094a1c
parentd07318f9de5c2e1dbb8ba98c2bbb50ee18ea9e6c
parent02ee4e9b65804b6f9bb8f7b11c811574aa42afc6
Merge remote-tracking branch 'origin/feature/15292-usb-image' into feature/15292-usb-image