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

b07cc4c6

Verified Commit b07cc4c6 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'develop' of dev.funkwhale.audio:funkwhale/funkwhale into develop

parents c027c90e f575f79a

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
api/Dockerfile 12 additions, 5 deletions

api/Dockerfile
api/funkwhale_api/common/serializers.py 1 addition, 1 deletion

api/funkwhale_api/common/serializers.py
deploy/docker-compose.yml 1 addition, 1 deletion

deploy/docker-compose.yml
dev.yml 2 additions, 2 deletions

dev.yml

with 17 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