diff options
| author | slene <vslene@gmail.com> | 2014-03-15 20:39:56 +0800 |
|---|---|---|
| committer | slene <vslene@gmail.com> | 2014-03-15 20:39:56 +0800 |
| commit | a33d03f008df3af4db481d6c207588d99d48ea50 (patch) | |
| tree | b7be9782750a34be145e75977f2eb55e8fb54f46 /modules | |
| parent | 81fedd819818d0a5c39044cf5af504e8045c9233 (diff) | |
| parent | e9fdf1031da4bf3c1acff0377b1d125ad99274e6 (diff) | |
| download | gitea-a33d03f008df3af4db481d6c207588d99d48ea50.tar.gz gitea-a33d03f008df3af4db481d6c207588d99d48ea50.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
routers/user/user.go
web.go
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/user.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/auth/user.go b/modules/auth/user.go index 9c9ce686df..21336cdd98 100644 --- a/modules/auth/user.go +++ b/modules/auth/user.go @@ -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 { |