hp/gogs

Hein-Pieter van Braam c11460fbc5 Merge branch 'master' of https://github.com/gogits/gogs		6 rokov pred
..
admin.go	50842a64f7 Merge branch 'master' of https://github.com/gogits/gogs	7 rokov pred
auth.go	a1d411a018 ldap: minor fix for PR #4398	7 rokov pred
form.go	d05395fe90 Refactoring: rename modules -> pkg	7 rokov pred
org.go	d05395fe90 Refactoring: rename modules -> pkg	7 rokov pred
repo.go	3b8b8a2ee3 pull_request: able to ignore whitespace when check conflict (#4834)	7 rokov pred
user.go	50842a64f7 Merge branch 'master' of https://github.com/gogits/gogs	7 rokov pred