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

Merge branch 'develop' into 'coc' 

# Conflicts:
#   README.rst
This commit is contained in:
Eliot Berriot 2019-03-11 15:22:35 +01:00
parent 89bcecd4b4
commit 71188d4578
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab/issue_templates/Bug.md
View File

@ -1,6 +1,9 @@
<!-- <!--
Hi there! You are reporting a bug on this project, and we want to thank you! 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 ensure your bug report is as useful as possible, please try to stick
to the following structure. You can leave the parts text between `<!- ->` to the following structure. You can leave the parts text between `<!- ->`
markers untouched, they won't be displayed in your final message. markers untouched, they won't be displayed in your final message.

4
.gitlab/issue_templates/Feature request.md
View File

@ -1,6 +1,10 @@
<!-- <!--
Hi there! You are about to share feature request or an idea, and we want to thank you! Hi there! You are about to share feature request or an idea, 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 we can deal with your idea or request, please try to stick To ensure we can deal with your idea or request, please try to stick
to the following structure. You can leave the parts text between `<!- ->` to the following structure. You can leave the parts text between `<!- ->`
markers untouched, they won't be displayed in your final message. markers untouched, they won't be displayed in your final message.

5
README.rst
View File

@ -32,3 +32,8 @@ Translate
^^^^^^^^^ ^^^^^^^^^
Translators willing to help can refer to `TRANSLATORS <TRANSLATORS.rst>`_ for instructions. Translators willing to help can refer to `TRANSLATORS <TRANSLATORS.rst>`_ for instructions.
Code of Conduct
---------------
`Our Code of Conduct <https://funkwhale.audio/code-of-conduct/>`_ applies to all the community spaces, including our GitLab instance. Please, take a moment to read it.