Merge branch 'master' of https://github.com/jesseduffield/lazygit

[fix] link to code of conduct

.travis.yml

@@ -14,6 +14,8 @@ before_install:
   # Download the binary to bin folder in $GOPATH
   # - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-386 -o $GOPATH/bin/dep
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+  - ls
+  - ls */*
   # Make the binary executable
   - chmod +x $GOPATH/bin/dep
   - ls $GOPATH/bin/
@@ -26,6 +28,7 @@ script:
 # - diff -u <(echo -n) <(gofmt -d .) # can't make gofmt ignore vendor directory
 # - go vet $(go list ./... | grep -v /vendor/)
   - if [ "${LATEST}" = "true" ]; then gox -os="linux darwin windows" -arch="amd64" -output="lazygit.." -ldflags "-X main.Rev=`git rev-parse --short HEAD`" -verbose ./...; fi
+  - ls */*
 deploy:
   provider: releases
   skip_cleanup: true

CONTRIBUTING.md

@@ -22,7 +22,7 @@ welcome your pull requests:
 ## Code of conduct
 Please note by participating in this project, you agree to abide by the [code of conduct].
 
-[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md
+[code of conduct]: https://github.com/jesseduffield/lazygit/blob/master/CODE-OF-CONDUCT.md
 
 ## Any contributions you make will be under the MIT Software License
 In short, when you submit code changes, your submissions are understood to be
@@ -31,4 +31,4 @@ covers the project. Feel free to contact the maintainers if that's a concern.
 
 ## Report bugs using Github's [issues](https://github.com/jesseduffield/lazygit/issues)
 We use GitHub issues to track public bugs. Report a bug by [opening a new
-issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!
+issue](https://github.com/jesseduffield/lazygit/issues/new); it's that easy!