Merge branch 'android' of git.nikiroo.be:git/fanfix into android android
authorNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:30:15 +0000 (08:30 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 9 Apr 2019 06:30:15 +0000 (08:30 +0200)
commit9978a56a375a8f6f456f0bfc7d1124d9281eea49
treec97682340e1d755c47cefda908d5cca6d737ae53
parent76f58e5637fb3b329ce15d847987f24b9fdaf04d
parent43c483f32b9b554354dbd5463895109095e389a5
Merge branch 'android' of git.nikiroo.be:git/fanfix into android