mirror of
https://github.com/DeviceFarmer/stf.git
synced 2026-04-20 05:53:38 +02:00
Conflicts: res/app/components/stf/screen/screen.jade res/app/device-control/device-control.css res/app/scripts/controllers/DeviceScreenCtrl.js res/app/scripts/services/ControlService.js