Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-10-19 20:12:51 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-10-19 20:12:51 +0300
commit1b6050626d18e966cb18f03320ead7af14525db5 (patch)
treed6192b535e944226f3e6acf12351db70a5fc36e1 /plugins/ExamplePlugin
parent6a14b0ce8461e62a4a37298c370775380305d71b (diff)
parent48ca332907257c35a7d94c1b120c9ad6cfaf320d (diff)
Merge branch 'master' into 3.0
Conflicts: core/Version.php plugins/Actions/Menu.php plugins/CoreHome/angularjs/history/history.service.js plugins/CoreHome/javascripts/menu.js plugins/CoreHome/templates/_menu.twig plugins/Dashboard/Menu.php plugins/Ecommerce/Menu.php plugins/ExampleUI/Menu.php plugins/Goals/Menu.php plugins/Referrers/Menu.php plugins/VisitsSummary/Menu.php tests/UI/expected-ui-screenshots tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/ExamplePlugin')
-rw-r--r--plugins/ExamplePlugin/Updates/0.0.2.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ExamplePlugin/Updates/0.0.2.php b/plugins/ExamplePlugin/Updates/0.0.2.php
index 6ab86893fe..b958d91df0 100644
--- a/plugins/ExamplePlugin/Updates/0.0.2.php
+++ b/plugins/ExamplePlugin/Updates/0.0.2.php
@@ -7,16 +7,16 @@
*
*/
-namespace Piwik\Plugins\ExamplePlugin;
+namespace Piwik\Plugins\ExamplePlugin\Updates;
use Piwik\Common;
use Piwik\Updater;
-use Piwik\Updates;
+use Piwik\Updates as PiwikUpdates;
/**
* Update for version 0.0.2.
*/
-class Updates_0_0_2 extends Updates
+class Updates_0_0_2 extends PiwikUpdates
{
/**