Antoine du Hamel 0dd7ac35d8 @uppy/companion: fix merge conflicts il y a 10 mois
..
@uppy 0dd7ac35d8 @uppy/companion: fix merge conflicts il y a 10 mois
uppy a42b150639 Merge stable branch il y a 10 mois