Merge branch 'master' into uploads-check

13097a93 · Jacob Vosmaer · 6b0ce357 · 165a1a4e · 13097a93
Commit 13097a93 authored Jan 06, 2016 by Jacob Vosmaer
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

README.md README.md +3 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -35,7 +35,9 @@ Options:
    	Print version and exit
 ```

-The 'auth backend' refers to the GitLab Rails applicatoin. The name is a holdover from when gitlab-workhorse only handled Git push/pull over HTTP. 
+The 'auth backend' refers to the GitLab Rails applicatoin. The name is
+a holdover from when gitlab-workhorse only handled Git push/pull over
+HTTP.

 Gitlab-workhorse can listen on either a TCP or a Unix domain socket. It
 can also open a second listening TCP listening socket with the Go