Merge branch 'master' of https://github.com/piwik/piwik

2 files changed, 1 insertions, 3 deletions

diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php
index ccac0c07d9..5d7d291df7 100644
--- a/core/DataTable/Renderer/Html.php
+++ b/core/DataTable/Renderer/Html.php
@@ -12,7 +12,6 @@ namespace Piwik\DataTable\Renderer;
 
 use Exception;
 use Piwik\DataTable;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Renderer;
 
 /**
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index cb8d33faa0..40055bbaa6 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -92,8 +92,7 @@ class Html extends ReportRenderer
         $frontPageView = new View('@CoreHome/ReportRenderer/_htmlReportHeader');
         $this->assignCommonParameters($frontPageView);
 
-        // todo rename 'websiteName' to 'reportTitle' once branch twig is merged
-        $frontPageView->assign("websiteName", $reportTitle);
+        $frontPageView->assign("reportTitle", $reportTitle);
         $frontPageView->assign("prettyDate", $prettyDate);
         $frontPageView->assign("description", $description);
         $frontPageView->assign("reportMetadata", $reportMetadata);