Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0e652103

Verified Commit 0e652103 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 8f261f96 d5cb412a

Branches

Tags

Loading

Changes 12

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 1 deletion

CHANGELOG
api/funkwhale_api/federation/migrations/0015_populate_domains.py 1 addition, 1 deletion

...kwhale_api/federation/migrations/0015_populate_domains.py
api/funkwhale_api/federation/serializers.py 11 additions, 13 deletions

api/funkwhale_api/federation/serializers.py
api/requirements/test.txt 3 additions, 5 deletions

api/requirements/test.txt
api/tests/federation/test_api_serializers.py 3 additions, 2 deletions

api/tests/federation/test_api_serializers.py
api/tests/federation/test_jsonld.py 7 additions, 7 deletions

api/tests/federation/test_jsonld.py
api/tests/federation/test_migrations.py 9 additions, 3 deletions

api/tests/federation/test_migrations.py
api/tests/federation/test_serializers.py 5 additions, 5 deletions

api/tests/federation/test_serializers.py
api/tests/test_import_audio_file.py 4 additions, 5 deletions

api/tests/test_import_audio_file.py
changes/changelog.d/871.bugfix 1 addition, 0 deletions

changes/changelog.d/871.bugfix
front/src/components/library/AlbumBase.vue 1 addition, 1 deletion

front/src/components/library/AlbumBase.vue
front/src/components/library/TrackBase.vue 2 additions, 2 deletions

front/src/components/library/TrackBase.vue

with 48 additions and 45 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