Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md: kept our version
This commit is contained in:
Thibaut Girka
2019-01-28 21:14:47 +01:00
5 changed files with 20 additions and 4 deletions

View File

@@ -35,7 +35,7 @@ CONTRIBUTING
=======
Contributing
Thank you for considering contributing to Mastodon 🐘
Thank you for considering contributing to Mastodon 🐘
You can contribute in the following ways:
@@ -44,6 +44,8 @@ You can contribute in the following ways:
- Contributing code to Mastodon by fixing bugs or implementing features
- Improving the documentation
If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
## Bug reports
Bug reports and feature suggestions can be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected in the past using the search function. Please also use descriptive, concise titles.