Merge branch 'master-to-develop' into 'develop' (10e630f3) · 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

10e630f3

Commit 10e630f3 authored 6 years ago by Eliot Berriot

Downloads
- Plain Diff

Merge branch 'master-to-develop' into 'develop'

Master to develop

Closes #575, #626, and #642

See merge request funkwhale/funkwhale!495

parents 6372b440 4e1f159a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
CONTRIBUTING.rst 1 addition, 1 deletion

CONTRIBUTING.rst
changes/changelog.d/642.documentation 1 addition, 0 deletions

changes/changelog.d/642.documentation
docs/installation/debian.rst 1 addition, 3 deletions

docs/installation/debian.rst
docs/installation/docker.rst 4 additions, 4 deletions

docs/installation/docker.rst
docs/installation/index.rst 4 additions, 4 deletions

docs/installation/index.rst

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