Merge branch 'master' into develop (0acb0dd3) · Commits · Martin Giger / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0acb0dd3

Verified Commit 0acb0dd3 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 6810e57c 30540709

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/common/utils.py 3 additions, 0 deletions

api/funkwhale_api/common/utils.py
api/funkwhale_api/music/metadata.py 38 additions, 7 deletions

api/funkwhale_api/music/metadata.py
api/funkwhale_api/music/models.py 8 additions, 1 deletion

api/funkwhale_api/music/models.py
api/funkwhale_api/music/views.py 6 additions, 2 deletions

api/funkwhale_api/music/views.py
api/tests/common/test_utils.py 14 additions, 0 deletions

api/tests/common/test_utils.py
api/tests/music/test_metadata.py 27 additions, 0 deletions

api/tests/music/test_metadata.py
api/tests/music/test_views.py 5 additions, 2 deletions

api/tests/music/test_views.py
changes/changelog.d/848.bugfix 1 addition, 0 deletions

changes/changelog.d/848.bugfix
changes/changelog.d/850.bugfix 1 addition, 0 deletions

changes/changelog.d/850.bugfix
changes/changelog.d/851.bugfix 1 addition, 0 deletions

changes/changelog.d/851.bugfix

with 104 additions and 12 deletions

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