Merge branch 'feature/shortcuts' into 'develop' (07446696) · Commits · mehraban / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

07446696

Commit 07446696 authored 7 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'feature/shortcuts' into 'develop'

Feature/shortcuts

See merge request funkwhale/funkwhale!16

parents 6adc8f0c 03f15ada

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/music/tests/factories.py 5 additions, 1 deletion

api/funkwhale_api/music/tests/factories.py
front/package.json 1 addition, 0 deletions

front/package.json
front/src/audio/queue.js 5 additions, 1 deletion

front/src/audio/queue.js
front/src/components/Sidebar.vue 7 additions, 1 deletion

front/src/components/Sidebar.vue
front/src/components/audio/Player.vue 12 additions, 1 deletion

front/src/components/audio/Player.vue

with 30 additions and 4 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