mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-22 16:06:18 +08:00
e8d187b5f6
Conflicts: app/views/canvas/edit/modal/_move_module.html.erb app/views/canvas/edit/modal/_move_module_group.html.erb |
||
---|---|---|
.. | ||
_delete_module.html.erb | ||
_delete_module_group.html.erb | ||
_edit_module.html.erb | ||
_edit_module_group.html.erb | ||
_move_module.html.erb | ||
_move_module_group.html.erb | ||
_new_module.html.erb |