Merge branch 'develop-cherry-pick' into 'master' (a95a095e) · Commits · Zwordi / 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

a95a095e

Commit a95a095e authored 5 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'develop-cherry-pick' into 'master'

Develop cherry pick

See merge request funkwhale/funkwhale!774

parents de9fc806 59a3be14

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

TRANSLATORS.rst 36 additions, 1 deletion

TRANSLATORS.rst
api/funkwhale_api/history/filters.py 5 additions, 0 deletions

api/funkwhale_api/history/filters.py
changes/changelog.d/838.bugfix 1 addition, 0 deletions

changes/changelog.d/838.bugfix
changes/changelog.d/849.bugfix 1 addition, 0 deletions

changes/changelog.d/849.bugfix
deploy/apache.conf 5 additions, 5 deletions

deploy/apache.conf
docs/admin/external-storages.rst 26 additions, 0 deletions

docs/admin/external-storages.rst
front/locales/fr_FR/LC_MESSAGES/app.po 1 addition, 1 deletion

front/locales/fr_FR/LC_MESSAGES/app.po
front/src/components/audio/Player.vue 5 additions, 1 deletion

front/src/components/audio/Player.vue

with 80 additions and 8 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