diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 04:04:56 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 04:04:56 +0400 |
| commit | 69b4a70048ea681bc62bca79abe7c763f2233a60 (patch) | |
| tree | 070b876a73f9402664f624e73de74ed4165518f5 /plugins/VisitsSummary | |
| parent | 031a2de96a2a3ec3f5f395977ee6c0c822b119b3 (diff) | |
| parent | 02ffeeb228f88d6053edf777d094b34c47b086b4 (diff) | |
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts:
core/Tracker/Settings.php
core/Tracker/Visit.php
plugins/Actions/Widgets.php
plugins/CustomVariables/Widgets.php
plugins/DevicesDetection/DevicesDetection.php
plugins/DevicesDetection/Widgets.php
plugins/Events/Widgets.php
plugins/Provider/Widgets.php
plugins/UserCountry/Widgets.php
plugins/UserSettings/Widgets.php
plugins/VisitTime/Widgets.php
plugins/VisitorInterest/Widgets.php
Diffstat (limited to 'plugins/VisitsSummary')
| -rw-r--r-- | plugins/VisitsSummary/Widgets.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/VisitsSummary/Widgets.php b/plugins/VisitsSummary/Widgets.php index b51d855106..3e1b5cfbfe 100644 --- a/plugins/VisitsSummary/Widgets.php +++ b/plugins/VisitsSummary/Widgets.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 |