diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 03:50:07 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 03:50:07 +0400 |
commit | 031a2de96a2a3ec3f5f395977ee6c0c822b119b3 (patch) | |
tree | 0b893ac3aae336f3009d791a1dd16dc09174b2f0 /plugins/VisitsSummary | |
parent | e6459f116f3cdc68580d57766e882f55799589c9 (diff) | |
parent | 54ee416790f04fca83b8521837ca049aac55c6fd (diff) |
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts:
plugins/DevicesDetection/DevicesDetection.php
plugins/Referrers/Referrers.php
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r-- | plugins/VisitsSummary/API.php | 2 | ||||
-rw-r--r-- | plugins/VisitsSummary/Controller.php | 2 | ||||
-rw-r--r-- | plugins/VisitsSummary/Menu.php | 2 | ||||
-rw-r--r-- | plugins/VisitsSummary/VisitsSummary.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 6ea74647ee..e89113eed2 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index fbdda4dc1f..44c1565b27 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/Menu.php b/plugins/VisitsSummary/Menu.php index 3a9d26029b..e79a338d9c 100644 --- a/plugins/VisitsSummary/Menu.php +++ b/plugins/VisitsSummary/Menu.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index c73e58afe1..066a8e2e35 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later |