Raphael 2489f8503f Merge branch 'master' into HEAD ... Conflicts: app/controllers/albums_controller.rb app/controllers/aspects_controller.rb app/controllers/photos_controller.rb app/controllers/registrations_controller.rb app/controllers/requests_controller.rb app/helpers/dashboards_helper.rb app/views/albums/show.html.haml app/views/aspects/manage.html.haml app/views/shared/_aspect_nav.haml app/views/shared/_sub_header.haml app/views/status_messages/_status_message.html.haml app/views/status_messages/show.html.haml config/locales/de.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml		2010-09-22 21:32:03 -07:00
..
_load_app_config.rb
_mongo.rb
backtrace_silencers.rb
carrierwave.rb	Spell our own name right	2010-09-15 17:56:18 -07:00
devise.rb
git_info.rb
inflections.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
locale.rb
logging.rb
mime_types.rb
rspec_generator.rb
secret_token.rb
session_store.rb