diff options
| author | sgiehl <stefan@piwik.org> | 2014-06-10 11:50:48 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-06-10 11:50:48 +0400 |
| commit | 70ad6070a802691533d37cb03abcc8afe690e4de (patch) | |
| tree | e611ba84e4f1137c147762e11d8989db5a2333f8 /piwik.php | |
| parent | e579da25b56e450035fd7118f2d47fc7ee1fb5e7 (diff) | |
| parent | 3c4eaf174ef5fe998a74ed2451341f9c212edad5 (diff) | |
Merge branch 'master' into DeviceDetector2
Conflicts:
plugins/DevicesDetection/DevicesDetection.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 |