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 /core/Menu | |
| 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 'core/Menu')
| -rw-r--r-- | core/Menu/MenuAbstract.php | 2 | ||||
| -rw-r--r-- | core/Menu/MenuAdmin.php | 2 | ||||
| -rw-r--r-- | core/Menu/MenuMain.php | 2 | ||||
| -rw-r--r-- | core/Menu/MenuReporting.php | 2 | ||||
| -rw-r--r-- | core/Menu/MenuTop.php | 2 | ||||
| -rwxr-xr-x | core/Menu/MenuUser.php | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php index 06d972f064..3f624b117f 100644 --- a/core/Menu/MenuAbstract.php +++ b/core/Menu/MenuAbstract.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/core/Menu/MenuAdmin.php b/core/Menu/MenuAdmin.php index f0c38c0a0c..8b11500c12 100644 --- a/core/Menu/MenuAdmin.php +++ b/core/Menu/MenuAdmin.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/core/Menu/MenuMain.php b/core/Menu/MenuMain.php index 4738562f58..aed7760752 100644 --- a/core/Menu/MenuMain.php +++ b/core/Menu/MenuMain.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/core/Menu/MenuReporting.php b/core/Menu/MenuReporting.php index c30e04016b..67f95bb8a6 100644 --- a/core/Menu/MenuReporting.php +++ b/core/Menu/MenuReporting.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/core/Menu/MenuTop.php b/core/Menu/MenuTop.php index 774fbd652d..1b3b543179 100644 --- a/core/Menu/MenuTop.php +++ b/core/Menu/MenuTop.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/core/Menu/MenuUser.php b/core/Menu/MenuUser.php index b3d140e6ae..25048a8682 100755 --- a/core/Menu/MenuUser.php +++ b/core/Menu/MenuUser.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 |