Changeset [45ce52ccce4ed480d525d2b9b97ae30a4ef2a3a4] by Kosuke Tanabe

Merge git@github.com:nabeta/next-l

Conflicts:

app/views/baskets/index.html.erb
app/views/bookmarked_resources/_index.html.erb
app/views/bookmarks/_index_bookmarked_resource.html.erb
app/views/checked_items/_checkouts.html.erb
app/views/checked_items/_list.html.erb
app/views/checkins/_list.html.erb
app/views/checkouts/_list.html.erb
app/views/checkouts/show.html.erb
app/views/creates/_index.html.erb
app/views/creates/_index_work.html.erb
app/views/donates/index.html.erb
app/views/events/index.html.erb
app/views/inventories/index.html.erb
app/views/item_has_use_restrictions/index.html.erb
app/views/item_has_use_restrictions/show.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/items/edit.html.erb
app/views/items/new.html.erb
app/views/items/show.html.erb
app/views/manifestations/_show_holding.html.erb
app/views/manifestations/show.html.erb
app/views/order_lists/index.html.erb
app/views/owns/index.html.erb
app/views/page/acquisition.html.erb
app/views/produces/_index.html.erb
app/views/produces/_produces.html.erb
app/views/realizes/_index.html.erb
app/views/reserves/index.html.erb
app/views/roles/index.html.erb

http://github.com/nabeta/next-l/...