MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Typos

This commit is contained in:
Reg 2018-06-25 21:48:28 +00:00 committed by Eliot Berriot
parent 2febce8fe7
commit f3062f5fbc
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING
View File

@ -82,7 +82,7 @@ Visit https://code.eliotberriot.com/funkwhale/funkwhale and clone the repository
A note about branches A note about branches
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefor, when submitting Merge Requests, ensure you are merging on the develop branch. Next release development occurs on the "develop" branch, and releases are made on the "master" branch. Therefore, when submitting Merge Requests, ensure you are merging on the develop branch.
Working with docker Working with docker

1
changes/changelog.d/typos.doc Normal file
View File

@ -0,0 +1 @@
Fixed a couple of typos

2
deploy/apache.conf
View File

@ -34,7 +34,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
# TLS # TLS
# Feel free to use your own configuration for SSL here or simply remove the # Feel free to use your own configuration for SSL here or simply remove the
# lines and move the configuration to the previous server block if you # lines and move the configuration to the previous server block if you
# don't want to run funkwhale behind https (this is not recommanded) # don't want to run funkwhale behind https (this is not recommended)
# have a look here for let's encrypt configuration: # have a look here for let's encrypt configuration:
# https://certbot.eff.org/lets-encrypt/debianstretch-apache.html # https://certbot.eff.org/lets-encrypt/debianstretch-apache.html
SSLEngine on SSLEngine on

2
deploy/nginx.conf
View File

@ -31,7 +31,7 @@ server {
# TLS # TLS
# Feel free to use your own configuration for SSL here or simply remove the # Feel free to use your own configuration for SSL here or simply remove the
# lines and move the configuration to the previous server block if you # lines and move the configuration to the previous server block if you
# don't want to run funkwhale behind https (this is not recommanded) # don't want to run funkwhale behind https (this is not recommended)
# have a look here for let's encrypt configuration: # have a look here for let's encrypt configuration:
# https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx # https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx
ssl_protocols TLSv1.2; ssl_protocols TLSv1.2;