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 /plugins/Actions/Actions.php | |
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 'plugins/Actions/Actions.php')
-rw-r--r-- | plugins/Actions/Actions.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index b42ccf2539..38ccbc229c 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -9,7 +9,6 @@ namespace Piwik\Plugins\Actions; use Piwik\ArchiveProcessor; -use Piwik\Common; use Piwik\Db; use Piwik\Plugins\CoreVisualizations\Visualizations\Sparklines; use Piwik\Site; |