mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-04 06:36:27 +08:00
cf72da5635
Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb |
||
---|---|---|
.. | ||
activities | ||
archive | ||
modals | ||
protocols | ||
_activities.html.erb | ||
_description.html.erb | ||
_description_label.html.erb | ||
_due_date.html.erb | ||
_due_date_label.html.erb | ||
_module_header.html.erb | ||
_module_header_due_date_label.html.erb | ||
_result.html.erb | ||
_result_user_generated.html.erb | ||
_show.html.erb | ||
_tags.html.erb | ||
activities.html.erb | ||
archive.html.erb | ||
protocols.html.erb | ||
results.html.erb | ||
samples.html.erb |