Merge branch 'dev' of github.com:gogits/gogs into access

Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
This commit is contained in:
Unknwon committed 2015-02-22 22:51:25 -05:00
commit 7ccab9cd09
65 files changed
+477 -462

No files matched your search

-1
View File
@@ -154,7 +154,6 @@ type Repository struct {
IsPrivate bool
IsBare bool
IsGoget bool
IsMirror bool
*Mirror `xorm:"-"`