Merge branch 'develop' into 'coc'

# Conflicts:
#   README.rst
This commit is contained in:
Eliot Berriot 2019-03-11 15:22:35 +01:00
commit 71188d4578
3 changed files with 12 additions and 0 deletions

View file

@ -1,6 +1,9 @@
<!--
Hi there! You are reporting a bug on this project, and we want to thank you!
If it's the first time you post here, please take a moment to read our Code of Conduct
(https://funkwhale.audio/code-of-conduct/) and ensure your issue respect our guidelines.
To ensure your bug report is as useful as possible, please try to stick
to the following structure. You can leave the parts text between `<!- ->`
markers untouched, they won't be displayed in your final message.