Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c80b80fb

Commit c80b80fb authored 5 years ago by Agate

:speech_balloon:

Downloads
- Plain Diff

Merge branch '1148-import-3.5' into 'master'

Resolve "CLI in-place import impossible with virtualenv with python3.5"

See merge request funkwhale/funkwhale!1134

parents 23db50ed f54038ca

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/management/commands/import_files.py 5 additions, 1 deletion

api/funkwhale_api/music/management/commands/import_files.py
api/tests/files/nested/valid.ogg 0 additions, 0 deletions

api/tests/files/nested/valid.ogg
api/tests/test_import_audio_file.py 14 additions, 0 deletions

api/tests/test_import_audio_file.py
changes/changelog.d/1048.bugfix 1 addition, 0 deletions

changes/changelog.d/1048.bugfix

with 20 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment