diff options
| author | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
| commit | b22dee447834c12f1095ba8ecf356970b2312dbf (patch) | |
| tree | 46a966716922f3d44734929486c43a26d37230f7 /composer.json | |
| parent | 72fa5107adcdbe1f4b8850f89c95dd3d5f5e6f4a (diff) | |
| parent | 611316e743d17d819b511d008da0e80e6425b686 (diff) | |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
plugins/CoreHome/javascripts/corehome.js
plugins/Ecommerce/Menu.php
plugins/Events/Events.php
plugins/Goals/Goals.php
plugins/Live/templates/index.twig
plugins/UserCountryMap/UserCountryMap.php
plugins/UsersManager/stylesheets/usersManager.less
plugins/VisitsSummary/Controller.php
plugins/VisitsSummary/Reports/Get.php
tests/UI/expected-ui-screenshots
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 8bcd8c8f27..fe3ca31419 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,8 @@ "pear/pear_exception": "~1.0.0", "piwik/referrer-spam-blacklist": "~1.0", "piwik/searchengine-and-social-list": "~1.0", - "tecnickcom/tcpdf": "~6.0" + "tecnickcom/tcpdf": "~6.0", + "piwik/piwik-php-tracker": "^1.0" }, "require-dev": { "aws/aws-sdk-php": "2.7.1", |