summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-29 16:50:09 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-29 16:50:09 +0200
commit70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (patch)
treea0970957a17eeaa0e31e501d5ce537023b846110 /application
parent4c907236af3b6dc11a7b4989ece1c84a26483c46 (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",