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 /piwik.php | |
| 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 'piwik.php')
| -rw-r--r-- | piwik.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |