]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of github.com:gogits/gogs into dev
authorLunny Xiao <xiaolunwen@gmail.com>
Thu, 10 Apr 2014 14:21:12 +0000 (22:21 +0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Thu, 10 Apr 2014 14:21:12 +0000 (22:21 +0800)
commit94c7278194694fec728b518d4390b03ba6c237a4
tree2aebf5fe63423b7b2eb14d58697bab1c95ffb3bb
parent16b6e5d50b665c5376b61ca7d02e3716a1c05ead
parent2577940c30f6a6d15390974ab36f8c3d1e00f9f4
Merge branch 'master' of github.com:gogits/gogs into dev

Conflicts:
web.go
routers/repo/http.go
web.go