Matchu d3b449a8f9 Merge branch 'globalized_search' into i18n ... Conflicts: Gemfile app/controllers/application_controller.rb app/controllers/items_controller.rb app/controllers/outfits_controller.rb app/helpers/application_helper.rb app/views/items/show.html.haml config/locales/en-MEEP.yml config/locales/en.yml public/stylesheets/compiled/screen.css		2013-01-25 11:09:07 -06:00
..
devise.en.yml	devise implemented, but not remembering	2011-01-26 13:40:15 -05:00
en-MEEP.yml	load pet by locale, prepare needed translations	2013-01-24 18:24:34 -06:00
en.yml	user:owns, user:wants queries	2013-01-25 10:35:35 -06:00
pt.yml	locale metadata, including hidden locales for item loading and selection	2013-01-24 18:24:34 -06:00
will_paginate.en-MEEP.yml	infer locale from params, then cookies, then Accept-Language header	2013-01-24 18:23:21 -06:00