summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-28 13:20:52 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-28 13:20:52 +0200
commitbbf2853c351425ea75f43599c3b229a8c323448c (patch)
tree4d0e3f91192b7ffbe18bb08ecc4004981ff8a23c /application
parent84c3bf369497e33b600deaea20297e89e265047a (diff)
parent4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'application')
-rw-r--r--application/config/user_agents.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index e2d3c3af0..4746f2fcd 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -126,6 +126,7 @@ $mobiles = array(
'sendo' => "Sendo",
// Operating Systems
+ 'android' => "Android",
'symbian' => "Symbian",
'SymbianOS' => "SymbianOS",
'elaine' => "Palm",