Unknown d886f4df97 Merge branch 'master' of github.com:gogits/gogs ...

Conflicts:
	models/repo.go
	routers/repo/single.go
	templates/repo/single.tmpl

2014-03-18 00:19:15 -04:00

..

access.go

…

action.go

…

models_test.go

…

models.go

…

publickey.go

…

repo.go

Merge branch 'master' of github.com:gogits/gogs

2014-03-18 00:19:15 -04:00

user.go

…