scinote-web/app/assets/javascripts/protocols
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master'
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +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 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
steps.js.erb Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00