mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-06 15:05:26 +08:00
Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb |
||
---|---|---|
.. | ||
confirmations_controller.rb | ||
invitations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
settings_controller.rb | ||
unlocks_controller.rb |