]> source.dussan.org Git - gitea.git/commit
Merge branch 'dev' of github.com:gogits/gogs into access
authorUnknwon <u@gogs.io>
Mon, 23 Feb 2015 03:51:25 +0000 (22:51 -0500)
committerUnknwon <u@gogs.io>
Mon, 23 Feb 2015 03:51:25 +0000 (22:51 -0500)
commit7ccab9cd09eca8fa60fdd519c97c259d4b521abd
tree914ea87da32fd27d889b2145f559c0fdad8c62af
parent25f5a8d7986a710cef01d02725071d2de0a6b143
parent2369881808a906f3072c935ab0575f08bd358821
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
12 files changed:
models/issue.go
models/models.go
models/org.go
models/repo.go
models/user.go
modules/middleware/repo.go
modules/setting/setting.go
routers/api/v1/repo.go
routers/repo/setting.go
templates/.VERSION
templates/org/home.tmpl
templates/user/profile.tmpl