gitorious.org Git - gitorious:yousource.git/commit

author	Marko Peltola <marko.peltola@jyu.fi>
	Thu, 15 Apr 2010 13:30:09 +0000 (16:30 +0300)
committer	Marko Peltola <marko.peltola@jyu.fi>
	Thu, 15 Apr 2010 13:30:09 +0000 (16:30 +0300)
commit	0cbdb8cbd12a56430e0aac0acd628ce48e16fafb
tree	70345b8c691465209dc3ab15d6d27ea2f3bfb1b4	tree \| snapshot
parent	0ee698e862f49ba1b7be9dbc1ec082eeb4dc381e	commit \| diff
parent	5c9b12b6126931c95a2d8e80af3211d369690696	commit \| diff

Merge branch 'master' of versotest.it.jyu.fi:verso/gitorious

Conflicts:
db/schema.rb

Signed-off-by: Marko Peltola <marko.peltola@jyu.fi>

e1e229a4af0779f1ab7e1533b2e26b232b

app/controllers/repositories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	diff1 \|	diff2 \|	blob \| history
app/models/repository.rb	diff1 \|	diff2 \|	blob \| history
app/views/projects/show.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/repositories/edit.html.erb	diff1 \|	diff2 \|	blob \| history
app/views/repositories/new.html.erb	diff1 \|	diff2 \|	blob \| history
config/locales/en.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history