]> source.dussan.org Git - gitea.git/commit
Merge remote-tracking branch 'upstream/dev'
authorevolvedlight <steve@evolvedlight.co.uk>
Mon, 13 Oct 2014 19:30:31 +0000 (20:30 +0100)
committerevolvedlight <steve@evolvedlight.co.uk>
Mon, 13 Oct 2014 19:30:31 +0000 (20:30 +0100)
commit8d2a6fc484b540819e211d52b8d54e97269f0918
treee5bfe7d3937bb2d18ba2fb50ea72514bd5bb4e13
parent29ac3980ffdb5faa525d77fddc109c9023ebe257
parent89bd994c836ecc9b6ceb80849f470521e1b15917
Merge remote-tracking branch 'upstream/dev'

Conflicts:
models/repo.go
models/models.go
models/repo.go
templates/repo/diff.tmpl