]> source.dussan.org Git - gitea.git/commitdiff
Merge branch 'dev' of github.com:gogits/gogs into dev
authorUnknown <joe2010xtmf@163.com>
Wed, 2 Apr 2014 14:45:01 +0000 (10:45 -0400)
committerUnknown <joe2010xtmf@163.com>
Wed, 2 Apr 2014 14:45:01 +0000 (10:45 -0400)
Conflicts:
routers/user/user.go


Trivial merge