scinote-web/app/views/canvas/edit/modal
Mojca Lorber e8d187b5f6 Merge branch 'ml_sci_395'
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
2016-08-30 11:41:25 +02:00
..
_delete_module.html.erb change position of buttons 2016-08-30 09:16:53 +02:00
_delete_module_group.html.erb change position of buttons 2016-08-30 09:16:53 +02:00
_edit_module.html.erb change position of buttons 2016-08-30 09:16:53 +02:00
_edit_module_group.html.erb change position of buttons 2016-08-30 09:16:53 +02:00
_move_module.html.erb Merge branch 'ml_sci_395' 2016-08-30 11:41:25 +02:00
_move_module_group.html.erb Merge branch 'ml_sci_395' 2016-08-30 11:41:25 +02:00
_new_module.html.erb change position of buttons 2016-08-30 09:16:53 +02:00