diff options
author | Cory <ckdarby@gmail.com> | 2012-06-06 18:46:40 +0200 |
---|---|---|
committer | Cory <ckdarby@gmail.com> | 2012-06-06 18:46:40 +0200 |
commit | 61fb9c1596ea220a0a8106160c5c68f9343ff9df (patch) | |
tree | 136126cc057bc58000f020990e32685c89adf399 /application/config/user_agents.php | |
parent | 037944e6c2083ce82ef5785947fddbf671362006 (diff) | |
parent | 47b673324f06236264ca64f8c3155aab51762609 (diff) |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into issue_1374
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'application/config/user_agents.php')
-rw-r--r-- | application/config/user_agents.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 76114616b..416ef5679 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -29,11 +29,10 @@ | ------------------------------------------------------------------- | USER AGENT TYPES | ------------------------------------------------------------------- -| This file contains four arrays of user agent data. It is used by the +| This file contains four arrays of user agent data. It is used by the | User Agent Class to help identify browser, platform, robot, and -| mobile device data. The array keys are used to identify the device +| mobile device data. The array keys are used to identify the device | and the array values are used to set the actual name of the item. -| */ $platforms = array( @@ -179,6 +178,7 @@ $mobiles = array( 'operamini' => 'Opera Mini', 'opera mini' => 'Opera Mini', 'opera mobi' => 'Opera Mobile', + 'fennec' => 'Firefox Mobile', // Other 'digital paths' => 'Digital Paths', |