-
Antoine Catton authored
Conflicts: master/bt5/vifib_base/bt/revision master/bt5/vifib_open_trade/bt/revision master/bt5/vifib_slap/bt/revision master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py
1e012c01
Conflicts: master/bt5/vifib_base/bt/revision master/bt5/vifib_open_trade/bt/revision master/bt5/vifib_slap/bt/revision master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py