aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2017-12-07 08:07:51 +0100
committerLuc Donnet2017-12-07 08:07:51 +0100
commit597b8eb21fe64babeb4a3ea03b1367c371237d98 (patch)
tree14f992c1b231da770ce950d8408fc5c8626b7836
parentb85fd26e9b399b488aaf76d417e63e2a75e98689 (diff)
parent0bb71d8146126f4f2c53ca0c7145f0e7d5eaeda5 (diff)
downloadchouette-core-597b8eb21fe64babeb4a3ea03b1367c371237d98.tar.bz2
Merge branch 'master' into staging
-rw-r--r--app/views/compliance_control_sets/show.html.slim2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 2291eda06..e6416fda4 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -104,4 +104,4 @@
cls: 'table has-filter has-search',
model: ComplianceControl
- = flotted_links @compliance_control_set.id
+ = flotted_links @compliance_control_set.id