Resolve merge conflict
authorChristian Johansen <christian@gitorious.org>
Mon, 3 Oct 2011 21:40:24 +0000 (23:40 +0200)
committerChristian Johansen <christian@gitorious.org>
Mon, 3 Oct 2011 21:40:24 +0000 (23:40 +0200)
commit7118ff630ca68f0c18edb082d0cc4367cafa64ea
treedbbd1bbfd7429e4092a4d32801250fa9025a1264
parent5325a467a1c51c31fc91fc7227b6f9d5aa84e642
parentdc242b57b807bb50c905e8190a54abf950ce8e2e
Resolve merge conflict
app/models/repository.rb
app/views/repositories/_clone_urls.html.erb
config/gitorious.sample.yml