diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-04 14:59:48 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-04 14:59:48 +0400 |
| commit | e4eadfee1c807c4e3c6b9ecec7d61cd30a5452f1 (patch) | |
| tree | fbfc4de0e7d5209bf62c9807c6355b0a737836b8 /misc | |
| parent | 28a2f9b15cd146ad6bf5921e351767a6d9bd9392 (diff) | |
| parent | 97cc6498c2886eb328d154a78fb51cce7427a91e (diff) | |
Merge branch 'master' into uiunittests
Conflicts:
tests/PHPUnit/Integration/BlobReportLimitingTest.php
tests/PHPUnit/IntegrationTestCase.php
tests/PHPUnit/UI
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/others/geoipUpdateRows.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/others/geoipUpdateRows.php b/misc/others/geoipUpdateRows.php index 6dffefc8d3..fa43c5d6c4 100755 --- a/misc/others/geoipUpdateRows.php +++ b/misc/others/geoipUpdateRows.php @@ -10,7 +10,7 @@ use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl; use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php; -require_once './cli-script-bootstrap.php' +require_once './cli-script-bootstrap.php'; ini_set("memory_limit", "512M"); |