Merge branch 'master' into develop (2fefe149) · Commits · Creak / 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

2fefe149

Unverified Commit 2fefe149 authored 4 years ago by Agate

💬

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 5d2e72e6 9d32d2a8

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 5 additions, 3 deletions

.gitlab-ci.yml
api/funkwhale_api/federation/tasks.py 1 addition, 0 deletions

api/funkwhale_api/federation/tasks.py
api/funkwhale_api/music/tasks.py 8 additions, 2 deletions

api/funkwhale_api/music/tasks.py
api/tests/federation/test_tasks.py 13 additions, 2 deletions

api/tests/federation/test_tasks.py
api/tests/music/test_tasks.py 2 additions, 0 deletions

api/tests/music/test_tasks.py
changes/changelog.d/1011.bugfix 1 addition, 0 deletions

changes/changelog.d/1011.bugfix
changes/changelog.d/1086.bugfix 1 addition, 0 deletions

changes/changelog.d/1086.bugfix
changes/changelog.d/1087.bugfix 1 addition, 0 deletions

changes/changelog.d/1087.bugfix
deploy/env.prod.sample 2 additions, 1 deletion

deploy/env.prod.sample
docs/installation/index.rst 13 additions, 0 deletions

docs/installation/index.rst
front/src/store/playlists.js 10 additions, 4 deletions

front/src/store/playlists.js

with 57 additions and 12 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