Merge branch '170-artist-type' into 'develop' (6785deb9) · 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

6785deb9

Commit 6785deb9 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch '170-artist-type' into 'develop'

See #170: added content_category on artist

See merge request funkwhale/funkwhale!1001

parents 9c8d2ef5 e2ab4ce8

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/audio/serializers.py 22 additions, 3 deletions

api/funkwhale_api/audio/serializers.py
api/funkwhale_api/music/migrations/0049_auto_20200122_1020.py 18 additions, 0 deletions

...funkwhale_api/music/migrations/0049_auto_20200122_1020.py
api/funkwhale_api/music/models.py 14 additions, 0 deletions

api/funkwhale_api/music/models.py
api/funkwhale_api/music/serializers.py 2 additions, 0 deletions

api/funkwhale_api/music/serializers.py
api/tests/audio/test_serializers.py 4 additions, 0 deletions

api/tests/audio/test_serializers.py
api/tests/audio/test_views.py 1 addition, 0 deletions

api/tests/audio/test_views.py
api/tests/music/test_serializers.py 1 addition, 0 deletions

api/tests/music/test_serializers.py

with 62 additions and 3 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