Merge branch 'master' into develop (41353259) · 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

41353259

Verified Commit 41353259 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 812709ad d224f74f

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

api/config/settings/common.py 14 additions, 2 deletions

api/config/settings/common.py
api/config/settings/local.py 21 additions, 2 deletions

api/config/settings/local.py
api/funkwhale_api/common/middleware.py 51 additions, 0 deletions

api/funkwhale_api/common/middleware.py
api/funkwhale_api/music/models.py 3 additions, 2 deletions

api/funkwhale_api/music/models.py
api/funkwhale_api/music/serializers.py 49 additions, 79 deletions

api/funkwhale_api/music/serializers.py
api/requirements/base.txt 1 addition, 0 deletions

api/requirements/base.txt

with 139 additions and 85 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