Cloud storage business Box has announced integration with Microsoft Office 365 just months after attacking Redmond for "stranding" users of the cloud productivity suite.
The file-sharing firm's integration allows customers to share, edit and save docs in Microsoft's suite of applications and also share links to Box files in Outlook, an apparent sign the two companies have buried the hatchet after their cloud spat in April.
Microsoft started the mud-flinging, using a blog post to slight Box for lacking a full repertoire of cloud services, and Box responded by attacking Redmond for "stranding hundreds of millions of users and customers" by keeping Office 365 on its own cloud storage offering, OneDrive.
Now Box users can get Office 365 access, as well as convert Outlook document attachments to Box links, despite Redmond doubling the amount of free storage on OneDrive to 15GB last month.
Box is also offering unlimited storage to all customers of its Business plan, a step that mirrors what it did for Enterprise level customers in 2010.
Aaron Levie, co-founder and CEO of Box, said: "The competition for business customers will no longer be about how much information a solution enables them to store, but rather, what it allows them to do with that information.
"Our deep integrations into the Office 365 suite expand our commitment of building capabilities that make content stored on our platform more valuable, information more powerful, and companies of all sizes more connected."
The integrations with Microsoft will get a beta release this autumn, though with Microsoft's own OneDrive offering it could be argued that the move sees Box competing for cloud storage users.