Merge branch 'qa-017-round2' into 'develop' (9b6c48aa) · Commits · Paul Walko / 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

9b6c48aa

Commit 9b6c48aa authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'qa-017-round2' into 'develop'

Qa 017 round2

See merge request funkwhale/funkwhale!422

parents 6572db3a 58333b59

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/playlists/models.py 5 additions, 7 deletions

api/funkwhale_api/playlists/models.py
api/funkwhale_api/playlists/serializers.py 6 additions, 8 deletions

api/funkwhale_api/playlists/serializers.py
api/funkwhale_api/playlists/views.py 6 additions, 4 deletions

api/funkwhale_api/playlists/views.py
api/tests/playlists/test_views.py 1 addition, 1 deletion

api/tests/playlists/test_views.py
front/src/App.vue 1 addition, 1 deletion

front/src/App.vue
front/src/views/playlists/Detail.vue 1 addition, 1 deletion

front/src/views/playlists/Detail.vue

with 20 additions and 22 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