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
..
assets	fixed workflowimg link	2016-08-30 11:03:33 +02:00
controllers	Merge branch 'master' into mz_file_upload_and_client_side_upgrade	2016-08-26 11:13:40 +02:00
datatables	Fix bug with linked tasks	2016-08-24 17:22:16 +02:00
helpers	Add missing commits for showing image and not able to preview	2016-08-26 16:49:32 +02:00
mailers
models	fixes step destroing bug and fixes reports [fixes SCI-247]	2016-08-29 12:04:46 +02:00
utilities	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
views	Merge branch 'ml_sci_395'	2016-08-30 11:41:25 +02:00