Changeset [5961af506165888049e8d6f707de8b8576ce15c1] by Kosuke Tanabe

December 8th, 2008 @ 06:00 PM

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/checkouts/_list.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/items/_index_inventory_file.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
config/locales/en.yml
config/locales/ja.yml

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

Committed by Kosuke Tanabe

  • M app/views/baskets/index.html.erb
  • M app/views/bookmarked_resources/_index.html.erb
  • M app/views/bookmarks/_index_bookmarked_resource.html.erb
  • M app/views/checked_items/_checkouts.html.erb
  • M app/views/checked_items/_list.html.erb
  • M app/views/checkouts/_list.html.erb
  • M app/views/creates/_index.html.erb
  • M app/views/creates/_index_work.html.erb
  • M app/views/donates/index.html.erb
  • M app/views/events/index.html.erb
  • M app/views/inventories/index.html.erb
  • M app/views/item_has_use_restrictions/index.html.erb
  • M app/views/items/_index_inventory_file.html.erb
  • M app/views/order_lists/index.html.erb
  • M app/views/owns/index.html.erb
  • M app/views/page/acquisition.html.erb
  • M app/views/produces/_index.html.erb
  • M app/views/produces/_produces.html.erb
  • M app/views/realizes/_index.html.erb
  • M app/views/reserves/index.html.erb
  • M app/views/roles/index.html.erb
  • M config/locales/ja.yml
  • M script/reindex_solr_all.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

integrated library system developed in Japan
http://www.next-l.jp/