]> source.dussan.org Git - gitea.git/commit
Merge branch 'master' of github.com:gogits/gogs into dev
authorUnknwon <joe2010xtmf@163.com>
Sun, 31 Aug 2014 07:11:55 +0000 (15:11 +0800)
committerUnknwon <joe2010xtmf@163.com>
Sun, 31 Aug 2014 07:11:55 +0000 (15:11 +0800)
commit7e36bf448db915250eb831a00b122fc1092df630
treef3e590a542497efd1908109f752e7a03a8abeca4
parentd78008b546b74d528629b79a7fee00b20f3437e2
parent03c6a395aa0d32c99e8264d18a3b5228656478df
Merge branch 'master' of github.com:gogits/gogs into dev

Conflicts:
dockerfiles/README.md
.gopmfile
.travis.yml
gogs.go
models/webhook.go
scripts/dockerfiles/images/gogits/Dockerfile
templates/.VERSION