diff options
| author | sgiehl <stefan@piwik.org> | 2014-10-15 23:07:52 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-10-15 23:07:52 +0400 |
| commit | fddda01cb0e83511416613a31533a70d072e3338 (patch) | |
| tree | 909217a2447f8723da5d1b038c8b64c36af55fb3 /plugins/Contents | |
| parent | bc822adb13a7b8a0fefb8d824fdd761e51879266 (diff) | |
| parent | 2d06c9a753b001a99c0b787e9735dc1e1de9ba87 (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
core/Version.php
Diffstat (limited to 'plugins/Contents')
| -rw-r--r-- | plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php | 2 | ||||
| -rw-r--r-- | plugins/Contents/tests/System/ContentsTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php index 9d4c08746a..92a6e5e319 100644 --- a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php +++ b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\Contents\tests\Fixtures; use Piwik\Date; use Piwik\Plugins\Goals\API as APIGoals; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use PiwikTracker; /** diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php index c5304fb19e..4332217622 100644 --- a/plugins/Contents/tests/System/ContentsTest.php +++ b/plugins/Contents/tests/System/ContentsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Plugins\Contents\tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents; use Piwik\Translate; |