Merge branch 'master' into pentaho-6.0

Rospaccio · Oct 25, 2015 · 1165fe7 · 1165fe7
2 parents 8bd3dd0 + 2ae7663
commit 1165fe7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pentaho-transparent-authentication-plugin/dashboards/admin/about.cdfde b/pentaho-transparent-authentication-plugin/dashboards/admin/about.cdfde
@@ -582,7 +582,7 @@
      },
      {
       "name": "html",
-      "value": "<footer class=\"footer\">@2015-2016 Alberto Mercati, Francesco Corti</footer> ",
+      "value": "<footer class=\"footer\">&copy; 2015-2016 Alberto Mercati, Francesco Corti</footer> ",
       "type": "Html"
      },
      {
@@ -697,4 +697,4 @@
   ]
  },
  "filename": "/system/PentahoTransparentAuthentication/dashboards/admin/about.cdfde"
-}
+}
diff --git a/pentaho-transparent-authentication-plugin/dashboards/admin/install.cdfde b/pentaho-transparent-authentication-plugin/dashboards/admin/install.cdfde
@@ -762,7 +762,7 @@
      },
      {
       "name": "html",
-      "value": "<footer class=\"footer\">@2015-2016 Alberto Mercati, Francesco Corti</footer> ",
+      "value": "<footer class=\"footer\">&copy; 2015-2016 Alberto Mercati, Francesco Corti</footer> ",
       "type": "Html"
      },
      {

diff --git a/pentaho-transparent-authentication-plugin/dashboards/admin/main.cdfde b/pentaho-transparent-authentication-plugin/dashboards/admin/main.cdfde
@@ -582,7 +582,7 @@
      },
      {
       "name": "html",
-      "value": "<footer class=\"footer\">@2015-2016 Alberto Mercati, Francesco Corti</footer> ",
+      "value": "<footer class=\"footer\">&copy; 2015-2016 Alberto Mercati, Francesco Corti</footer> ",
       "type": "Html"
      },
      {
@@ -697,4 +697,4 @@
   ]
  },
  "filename": "/system/PentahoTransparentAuthentication/dashboards/admin/main.cdfde"
-}
+}