diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-10 17:39:06 +0100 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-03-10 17:39:06 +0100 |
commit | 65f6ad4aadd208f3c27d3064508a5eac3fa52fc6 (patch) | |
tree | 15e63e02b3dc192116167fd47be9a599a0c91176 /system | |
parent | 133beafd1746b0f5fa06794fd183289d43defdbe (diff) | |
parent | e8f5890e4b7eb52ed4d905a225c3bf985f397439 (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'system')
-rw-r--r-- | system/core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 75f945efd..a2a7dd564 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -318,4 +318,4 @@ class CI_Config { // END CI_Config class /* End of file Config.php */ -/* Location: ./system/core/Config.php */
\ No newline at end of file +/* Location: ./system/core/Config.php */ |