book/04-git-server/sections/hosted.asc
book/04-git-server/sections/generating-ssh-key.asc
book/04-git-server/sections/git-daemon.asc
book/04-git-server/sections/gitweb.asc
Merge remote-tracking branch 'upstream/master' into 04-git-server

* upstream/master:
  Git репозиторий -> Git-репозиторий
  Update status.json
  Fixed typo
  Translated "Generating Your SSH Public Key" (Chapter 4)

Conflicts:
	book/04-git-server/sections/generating-ssh-key.asc
	status.json
Merge pull request #79 from evgkrsk/04-git-server

04 git server (4/9)