]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'origin/master'
authorFuXiaoHei <fuxiaohei@hexiaz.com>
Wed, 19 Mar 2014 14:23:46 +0000 (22:23 +0800)
committerFuXiaoHei <fuxiaohei@hexiaz.com>
Wed, 19 Mar 2014 14:23:46 +0000 (22:23 +0800)
commit9bc06dc716ccaae500c4afff69b054d973bfdd17
tree09f5a6f6c6ad7c10e5b791b764a4fd65d3eab271
parentf0993ae3c806211f956b974be3f40ace7ca2d0fb
parent199fdd03360e3c9d1d2fb93fe993e01d115e8312
Merge remote-tracking branch 'origin/master'

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