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 /composer.json | |
| parent | e579da25b56e450035fd7118f2d47fc7ee1fb5e7 (diff) | |
| parent | 3c4eaf174ef5fe998a74ed2451341f9c212edad5 (diff) | |
Merge branch 'master' into DeviceDetector2
Conflicts:
plugins/DevicesDetection/DevicesDetection.php
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 3015cb736b..4347967b19 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "piwik/piwik", "type": "application", - "description": "Open Source Real Time Web Analytics Platform", + "description": "the leading free/libre analytics platform", "keywords": ["piwik","web","analytics"], "homepage": "http://piwik.org", "license": "GPL-3.0+", |