mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-12 01:46:55 +08:00
Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise_invitable.en.yml | ||
en.yml |