Merge branch
authorPhilippe Lelong <lelong.ph@meltemus.com>
Fri, 16 Dec 2016 11:59:14 +0000 (12:59 +0100)
committerPhilippe Lelong <lelong.ph@meltemus.com>
Fri, 16 Dec 2016 11:59:14 +0000 (12:59 +0100)
commit0e8ac7d8d9c2a1dc6389c6a55e2825cc55f69c53
treeef8269d6b1225581868b0b3e92cbe9ee5b29b9d4
parent430856118319fbaf784e4bfed6a6f2bf2f0bbea5
Merge branch

Signed-off-by: Philippe Lelong <lelong.ph@meltemus.com>
HomeScreen/qml/main.qml