]> source.dussan.org Git - gitea.git/commitdiff
projects / gitea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e44d9ff 3ceb008)
Merge branch 'master' of github.com:gogits/gogs
authorUnknown <joe2010xtmf@163.com>
Tue, 18 Mar 2014 04:19:15 +0000 (00:19 -0400)
committerUnknown <joe2010xtmf@163.com>
Tue, 18 Mar 2014 04:19:15 +0000 (00:19 -0400)
Conflicts:
models/repo.go
routers/repo/single.go
templates/repo/single.tmpl

1  2 
models/repo.go patch | diff1 | diff2 | blob | history
routers/repo/single.go patch | diff1 | diff2 | blob | history
templates/repo/single.tmpl patch | diff1 | diff2 | blob | history

diff --cc models/repo.go
Simple merge
diff --cc routers/repo/single.go
Simple merge
diff --cc templates/repo/single.tmpl
Simple merge
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea