diff options
| author | diosmosis <benaka@piwik.pro> | 2014-12-09 07:20:38 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-12-09 07:20:38 +0300 |
| commit | 398f4a90b6f967f8736a27428d404d0c93e975ba (patch) | |
| tree | 5a6fe64e1cefc1ac3299464da080157cc8d7d4d9 /tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml | |
| parent | 103c893fdbfc71ee9a9e4dbc4c90ee0d24c36249 (diff) | |
| parent | c9aace86cd4eda164f1c6751bec38e8c59f54167 (diff) | |
Merge branch 'master' into iis_advanced_log_importing
Conflicts:
tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
Diffstat (limited to 'tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml')
| -rw-r--r-- | tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index aa77898c8a..82fd2a7603 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer</label> @@ -22,7 +22,7 @@ <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> </row> <row> <label>Epiphany</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> </row> <row> <label>RockMelt</label> @@ -46,7 +46,7 @@ <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> @@ -82,7 +82,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome Mobile</label> @@ -94,6 +94,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/UserSettings/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> </row> </result>
\ No newline at end of file |