Luka Murn 1dff6c527e Merge pull request #302 from Ducz0r/lm-sci-691-fix ... Correctly import protocols with rich text [SCI-691]		2016-11-21 14:04:22 +01:00
..
assets	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
controllers	Re-introduce fix for SCI-650 that was lost during merge	2016-11-18 10:57:03 +01:00
datatables	Fix bug with linked tasks	2016-08-24 17:22:16 +02:00
helpers	Also employ "no format" Nokogiri strategy when sanitizing	2016-11-17 16:43:14 +01:00
mailers	Bugfix for notification emails	2016-10-13 12:12:28 +02:00
models	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
utilities	Also employ "no format" Nokogiri strategy when sanitizing	2016-11-17 16:43:14 +01:00
views	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00