domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

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

Browse source 
Conflicts:
	routers/user/user.go
	web.go
This commit is contained in:
slene 2014-03-15 20:39:56 +08:00
commit a33d03f008
9 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/auth/user.go
View file

@ -63,7 +63,7 @@ func IsSignedIn(session sessions.Session) bool {
type FeedsForm struct {
UserId int64 `form:"userid" binding:"Required"`
Offset int64 `form:"offset"`
Page int64 `form:"p"`
}
type UpdateProfileForm struct {