diff options
| author | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-09-18 11:01:48 +0000 |
| commit | 64e961fe8ebc1eeb331cef2604cf4c8714e8d8ad (patch) | |
| tree | 2f44dc405415cbf03f81eff0c0967f29abec7c7e /docker/android-emulator/Dockerfile | |
| parent | 14dc607adeaae623e643b1045ed1917d289a19c4 (diff) | |
| parent | afa289cbcce4a431f6bd587b490b6470ed6caa50 (diff) | |
Merge branch 'develop' into 'master'
Fixes failing tests
See merge request !5
Diffstat (limited to 'docker/android-emulator/Dockerfile')
0 files changed, 0 insertions, 0 deletions