Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

b12c823d

Verified Commit b12c823d authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents b70636c2 41fa4f62

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changes/changelog.d/652.bugfix 1 addition, 0 deletions

changes/changelog.d/652.bugfix
changes/changelog.d/751.bugfix 1 addition, 0 deletions

changes/changelog.d/751.bugfix
front/src/components/audio/album/Card.vue 1 addition, 1 deletion

front/src/components/audio/album/Card.vue
front/src/components/manage/moderation/InstancePolicyForm.vue 1 addition, 1 deletion

...t/src/components/manage/moderation/InstancePolicyForm.vue
front/src/components/playlists/Editor.vue 2 additions, 2 deletions

front/src/components/playlists/Editor.vue
front/src/components/playlists/PlaylistModal.vue 3 additions, 2 deletions

front/src/components/playlists/PlaylistModal.vue
front/src/views/playlists/Detail.vue 2 additions, 2 deletions

front/src/views/playlists/Detail.vue
front/src/views/radios/Detail.vue 2 additions, 2 deletions

front/src/views/radios/Detail.vue

with 13 additions and 10 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