Merge branch 'federation-radios' into 'develop' (fe239969) · 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

fe239969

Commit fe239969 authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'federation-radios' into 'develop'

Ensure radio tracks only return playable tracks

See merge request funkwhale/funkwhale!425

parents 4d425e92 ec3fcefa

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/federation/admin.py 1 addition, 1 deletion

api/funkwhale_api/federation/admin.py
api/funkwhale_api/federation/api_views.py 2 additions, 2 deletions

api/funkwhale_api/federation/api_views.py
api/funkwhale_api/music/models.py 3 additions, 3 deletions

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

api/funkwhale_api/radios/radios.py
api/tests/radios/test_radios.py 24 additions, 20 deletions

api/tests/radios/test_radios.py

with 32 additions and 26 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