summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorGDmac <grdalenoort@gmail.com>2013-11-11 13:15:18 +0100
committerGDmac <grdalenoort@gmail.com>2013-11-11 13:15:18 +0100
commit5d9b03b022bbc95c3c57830cc4cc27c39c7a59be (patch)
tree9f03a708761e0ac429a0ed080d2eef593e4694a0 /application
parent01e9fb1d6aab8e513a9ebd786e9abff74d8b63ca (diff)
parentc761a206def7714d18623d46b05adc2bbeedce21 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application')
-rw-r--r--application/config/user_agents.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 899e96a94..0953deafd 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -104,7 +104,8 @@ $browsers = array(
'hotjava' => 'HotJava',
'amaya' => 'Amaya',
'IBrowse' => 'IBrowse',
- 'Maxthon' => 'Maxthon'
+ 'Maxthon' => 'Maxthon',
+ 'Ubuntu' => 'Ubuntu Web Browser'
);
$mobiles = array(