]> source.dussan.org Git - gitea.git/commitdiff
projects / gitea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bfad68 c61fa28)
Merge branch 'master' of localhost:xiaoxiao/gogs3
authorLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:19:02 +0000 (17:19 +0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:19:02 +0000 (17:19 +0800)
Conflicts:
.gitignore
LICENSE

1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
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