Unverified Commit a08a74f1 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_22.05' into release_23.0

parents 2622b9dc 6d9b0fd2

lib/galaxy/files/sources/dropbox.py

+6 −2
Original line number Diff line number Diff line 
try:

    from fs.dropboxfs import DropboxFS

except ImportError:

    # fs.dropboxfs < 0.3

    try:

        from dropboxfs.dropboxfs import DropboxFS

    except ImportError: