summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryaoshanliang <1329517386@qq.com>2015-03-15 02:56:47 +0100
committeryaoshanliang <1329517386@qq.com>2015-03-15 02:56:47 +0100
commit561b820ce81d8fe3367d6ba6bf550b9cc936ea57 (patch)
tree56dff3d878f008da2940f5150453812f5dbcd340
parent9971e7bc326df1a14e7bb17b1290e5fe5bfd5c60 (diff)
parentf58930755e906895af2b04d6c438e1bbf26e154f (diff)
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
-rw-r--r--application/config/config.php2
-rw-r--r--application/config/user_agents.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/application/config/config.php b/application/config/config.php
index cc1307ca9..f78371f13 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -330,6 +330,8 @@ $config['encryption_key'] = '';
| The location to save sessions to, driver dependant.
|
| For the 'files' driver, it's a path to a writable directory.
+| WARNING: Only absolute paths are supported!
+|
| For the 'database' driver, it's a table name.
| Please read up the manual for the format with other session drivers.
|
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 68d785365..6f3295a70 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -12,6 +12,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
*/
$platforms = array(
+ 'windows nt 10.0' => 'Windows 10',
'windows nt 6.3' => 'Windows 8.1',
'windows nt 6.2' => 'Windows 8',
'windows nt 6.1' => 'Windows 7',