mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-11 17:36:13 +08:00
Conflicts: app/controllers/users/invitations_controller.rb app/controllers/users/settings_controller.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise_invitable.en.yml | ||
en.yml |