]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of github.com:gogits/gogs
authorUnknown <joe2010xtmf@163.com>
Thu, 6 Mar 2014 16:12:37 +0000 (11:12 -0500)
committerUnknown <joe2010xtmf@163.com>
Thu, 6 Mar 2014 16:12:37 +0000 (11:12 -0500)
commitd8b92b4bc99d642c7fd9a6080bdfa8d782e8c325
treeba54f16bd242d619bb4ffdc051ea07a6c2311117
parent1249392c8390d9e348c388c0ad6e80fce208cd95
parent4c1858c07b972e64d47218646f89b2fb5340a993
Merge branch 'master' of github.com:gogits/gogs

Conflicts:
templates/user/signup.tmpl
routers/user/user.go
templates/user/signup.tmpl