Merge branch 'master' into develop (371dc012) · Commits · Zwordi / 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

371dc012

Verified Commit 371dc012 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents e24c1f23 d8dd76f1

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/utils.py 1 addition, 1 deletion

api/funkwhale_api/music/utils.py
api/tests/music/test_utils.py 9 additions, 0 deletions

api/tests/music/test_utils.py
changes/changelog.d/814.enhancement 1 addition, 0 deletions

changes/changelog.d/814.enhancement
changes/changelog.d/833.bugfix 1 addition, 0 deletions

changes/changelog.d/833.bugfix
changes/changelog.d/855.bugfix 1 addition, 0 deletions

changes/changelog.d/855.bugfix
changes/changelog.d/857.bugfix 1 addition, 0 deletions

changes/changelog.d/857.bugfix
front/src/components/Home.vue 5 additions, 6 deletions

front/src/components/Home.vue
front/src/components/auth/SubsonicTokenForm.vue 9 additions, 2 deletions

front/src/components/auth/SubsonicTokenForm.vue
front/src/components/forms/PasswordInput.vue 25 additions, 3 deletions

front/src/components/forms/PasswordInput.vue
front/src/components/library/TrackBase.vue 5 additions, 5 deletions

front/src/components/library/TrackBase.vue
front/src/style/_main.scss 1 addition, 0 deletions

front/src/style/_main.scss

with 59 additions and 17 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