mlorb f4aa75b4d2 Merge pull request #305 from mlorb/ml_sci_692 ... Fix empty space and blockquote padding - rich text editing [SCI-692]		2016-11-21 14:38:33 +01:00
..
assets	Merge pull request #305 from mlorb/ml_sci_692	2016-11-21 14:38:33 +01:00
controllers	Re-introduce fix for SCI-650 that was lost during merge	2016-11-18 10:57:03 +01:00
datatables
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	fix empty space and blockquote padding - rich text editing	2016-11-18 12:43:57 +01:00