Merge branch 'adding_files'
authorTero Hanninen <tero.j.hanninen@jyu.fi>
Fri, 16 Apr 2010 11:39:47 +0000 (14:39 +0300)
committerTero Hanninen <tero.j.hanninen@jyu.fi>
Fri, 16 Apr 2010 11:39:47 +0000 (14:39 +0300)
commitd5aca9d30b9aa393db70123c3547cb3b2bffc93c
treeddf1f4b0cf9970be2329c51c691e0c460e74219c
parent4ca132242f093b00c3c336d31c5db40552bf870a
parent454c737fd5e5dde0ea7470c456dbe8b4cae2c5d2
Merge branch 'adding_files'
app/controllers/trees_controller.rb
app/models/repository.rb