00e9a5df5b
Conflicts: app/controllers/admin/users_new_interface_controller.rb app/views/admin/users_new_interface/show.html.erb config/locales/en.yml config/routes.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.zh_tw.yml | ||
en.yml | ||
mobile.en.yml | ||
mobile.zh_tw.yml | ||
mongoid.zh_tw.yml | ||
new_ui.en.yml | ||
new_ui.zh_tw.yml | ||
picker.en.yml | ||
picker.zh_tw.yml | ||
rails.zh_tw.yml | ||
social_share_button.en.yml | ||
social_share_button.zh-tw.yml | ||
zh_tw.yml |