]> source.dussan.org Git - gitea.git/commit
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)
commit97b133bbee77740bded5b4f2e7ad9896d6804cf7
treec84347a14faa2fa7813ae0922f8676090d6b4744
parentd9005ee970270bca97e81d59edca4722752d160d
parentadf42a5b547e8e738b8b7e795a0863bc1eab58a5
Merge branch 'dev' of github.com:gogits/gogs into dev

Conflicts:
routers/user/user.go