diff options
| author | sgiehl <stefan@piwik.org> | 2015-01-22 07:48:21 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2015-01-22 07:48:21 +0300 |
| commit | 165c8865b6f3eb374f5140d8da7b726a0e3ba5fb (patch) | |
| tree | 639018b7d4f5a56d2ceec8f18c4b8a6f40f4bd55 /misc/others | |
| parent | a31a25e71b60eb26fac907b52b8c26465c855c0b (diff) | |
| parent | 9ed81d72cbaa1ebe382502d9417d7d1ac64dab00 (diff) | |
Merge branch 'master' into move_language_report
Conflicts:
tests/PHPUnit/UI
Diffstat (limited to 'misc/others')
| -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 f7b5473c3c..44a0802390 100755 --- a/misc/others/geoipUpdateRows.php +++ b/misc/others/geoipUpdateRows.php @@ -34,7 +34,7 @@ if (!Common::isPhpCliMode()) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <script type="text/javascript" src="../../libs/jquery/dist/jquery.min.js"></script> + <script type="text/javascript" src="../../libs/bower_components/jquery/dist/jquery.min.js"></script> <script type="text/javascript"> (function ($) { var count = <?php echo $count; ?>; |