]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'origin/master'
authorFuXiaoHei <fuxiaohei@hexiaz.com>
Wed, 19 Mar 2014 14:19:17 +0000 (22:19 +0800)
committerFuXiaoHei <fuxiaohei@hexiaz.com>
Wed, 19 Mar 2014 14:19:17 +0000 (22:19 +0800)
commitc7660a81c669455e418610225034d6301cb59872
treed114a5d41a3601dd199aabb47507482cc92407b6
parenta0e73e2b5411499719a7e02281c48ad40dedfa24
parent483cc3136920a70ae1707ec5337d574b288853c3
Merge remote-tracking branch 'origin/master'

Conflicts:
routers/user/user.go
routers/repo/repo.go