Changeset [3ada9158e21ad84209879b6f1d64e812bff6e2de] by Kosuke Tanabe
Revision 3ada9158e21ad84209879b6f1d64e812bff6e2de,
committed by Kosuke Tanabe
· December 8th, 2008 @ 06:39 PM
Merge git@github.com:nabeta/next-l
Conflicts:
app/views/inventories/index.html.erb
app/views/items/_index.html.erb
app/views/items/_index_inventory_file.html.erb
app/views/items/_index_manifestation.html.erb
app/views/manifestations/_show_holding.html.erb
app/views/manifestations/show.html.erb