Boris Johnson and Macron speak after military pact row

UK and France will work together despite a diplomatic spat over Australian submarines, Downing Street says.