Merge branch 'patch-1' into 'master'

[ci skip] Fixed minor typo in workflow documentation This change is self-explanatory. See merge request !2503

Merge branch 'patch-1' into 'master'
481644ca · Achilleas Pipinellis · a382ad99 · 1c728ddb · 481644ca
Commit 481644ca authored Jan 20, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

protected_branches.md doc/workflow/protected_branches.md +1 -1

No files found.
--- a/doc/workflow/protected_branches.md
+++ b/doc/workflow/protected_branches.md
 # Protected branches

-Permission in GitLab are fundamentally defined around the idea of having read or write permission to the repository and branches.
+Permissions in GitLab are fundamentally defined around the idea of having read or write permission to the repository and branches.

 To prevent people from messing with history or pushing code without review, we've created protected branches.