Merge branch 'master' into develop (663600d5) · Commits · Mélanie Chauvel / 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

663600d5

Verified Commit 663600d5 authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master' into develop

parents f56c9aa0 353ac081

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

api/config/settings/common.py 1 addition, 1 deletion

api/config/settings/common.py
api/funkwhale_api/common/storage.py 12 additions, 4 deletions

api/funkwhale_api/common/storage.py
api/requirements/base.txt 1 addition, 0 deletions

api/requirements/base.txt
api/tests/common/test_storages.py 28 additions, 0 deletions

api/tests/common/test_storages.py
changes/changelog.d/835.bugfix 1 addition, 0 deletions

changes/changelog.d/835.bugfix
changes/changelog.d/847.bugfix 1 addition, 0 deletions

changes/changelog.d/847.bugfix
front/src/components/instance/Stats.vue 1 addition, 1 deletion

front/src/components/instance/Stats.vue

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