diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2010-08-31 16:42:43 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2010-08-31 16:42:43 +0200 |
| commit | b1e973247b66e0f4dc576484add50c2ebe10125a (patch) | |
| tree | 9c80207be0914599ee04dc0db80d4c957c1192c2 /application/config | |
| parent | 95b183addfb1683583d401e04f2684ceb86f8b96 (diff) | |
| parent | 7284f06585a689702ea86684893c999065621460 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/config.php b/application/config/config.php index 6e52bcc17..c5eae8f5b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -213,8 +213,8 @@ $config['cache_path'] = ''; | Encryption Key |-------------------------------------------------------------------------- | -| If you use the Encryption class or the Sessions class with encryption -| enabled you MUST set an encryption key. See the user guide for info. +| If you use the Encryption class or the Session class you +| MUST set an encryption key. See the user guide for info. | */ $config['encryption_key'] = ""; |