scinote-web/app/assets/javascripts/protocols
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
..
import_export Fix importer so it supports rendering & importing rich text format 2016-11-15 16:57:53 +01:00
edit.js Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
header.js.erb Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
index.js fix protocol preview 2017-01-06 10:10:33 +01:00
steps.js.erb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00