Conflicts: app/controllers/user_controller.rb app/views/user/login.html.erb config/locales/en.yml |
||
---|---|---|
.. | ||
classic_pagination | ||
deadlock_retry | ||
file_column | ||
globalize2 | ||
http_accept_language | ||
irs_process_scripts | ||
oauth-plugin | ||
open_id_authentication | ||
output_compression | ||
rails-i18n | ||
session-persistence | ||
sql_session_store | ||
validates_email_format_of |