]> source.dussan.org Git - gitea.git/commitdiff
Merge branch 'master' of localhost:xiaoxiao/gogs5
authorLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:54:08 +0000 (17:54 +0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Tue, 25 Mar 2014 09:54:08 +0000 (17:54 +0800)
Conflicts:
.gitignore


Trivial merge