Merge branch 'master' into develop (17996ca9) · Commits · Mélanie Chauvel / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

17996ca9

Verified Commit 17996ca9 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents df34b961 31478ea6

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/manage/serializers.py 6 additions, 0 deletions

api/funkwhale_api/manage/serializers.py
api/funkwhale_api/manage/views.py 1 addition, 1 deletion

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

api/funkwhale_api/music/metadata.py
api/funkwhale_api/music/utils.py 1 addition, 0 deletions

api/funkwhale_api/music/utils.py
api/tests/music/test_metadata.py 28 additions, 0 deletions

api/tests/music/test_metadata.py
changes/changelog.d/122.enhancement 1 addition, 0 deletions

changes/changelog.d/122.enhancement
changes/changelog.d/868.enhancement 1 addition, 0 deletions

changes/changelog.d/868.enhancement
changes/changelog.d/869.bugfix 1 addition, 0 deletions

changes/changelog.d/869.bugfix
front/src/components/manage/users/UsersTable.vue 2 additions, 1 deletion

front/src/components/manage/users/UsersTable.vue

with 47 additions and 4 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