summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-12-14 19:49:51 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-12-14 19:49:51 +0000
commitf7af7c993ba14da4a0479ee04d5e4b18754edea4 (patch)
treec8dbf3fec60672f5f3419ca23b2ddb94bf783728
parent381a9951e91275f41ce09a17380222f1af3d6a22 (diff)
parent829dc1493cd82ff9c3ba7f517131ef5fe4c71e9c (diff)
downloadgitlab-ce-f7af7c993ba14da4a0479ee04d5e4b18754edea4.tar.gz
Merge branch 'fix-typo-mailing-list' into 'master'
Fix Typo [mailinglist to mailing list] Closes: #4078 See merge request !2098
-rw-r--r--CONTRIBUTING.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7f5da063fd4..306ffdaf68f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ Issues and merge requests should be in English and contain appropriate language
Please help other GitLab users when you can.
The channels people will reach out on can be found on the [getting help page](https://about.gitlab.com/getting-help/).
-Sign up for the mailinglist, answer GitLab questions on StackOverflow or respond in the IRC channel.
+Sign up for the mailing list, answer GitLab questions on StackOverflow or respond in the IRC channel.
You can also sign up on [CodeTriage](http://www.codetriage.com/gitlabhq/gitlabhq) to help with one issue every day.
## I want to contribute!
@@ -191,4 +191,4 @@ This code of conduct applies both within project spaces and in public spaces whe
Instances of abusive, harassing, or otherwise unacceptable behavior can be reported by emailing contact@gitlab.com
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/) \ No newline at end of file