scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 17:36:13 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/views/steps
History
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
_edit.html.erb
_empty_step.html.erb
_form_assets.html.erb
_form_checklists.html.erb
_form_tables.html.erb
_new.html.erb
_step.html.erb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00