summaryrefslogtreecommitdiffstats
path: root/system/core/Config.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-12-25 14:53:24 +0100
committerAndrey Andreev <narf@bofh.bg>2011-12-25 14:53:24 +0100
commitd34686f1a5ef557e8022c81961ad179a88c347ae (patch)
tree62c74b609e2093399abd5bc9af3934fb129cf33c /system/core/Config.php
parenta92b903c0e6c2faa2a9480e23e2d3e4b6308878f (diff)
parenta96ade374f28cdae97036fc253fd8b2a0e8dc81a (diff)
Merge upstream branch
Diffstat (limited to 'system/core/Config.php')
-rwxr-xr-xsystem/core/Config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index abd2767d5..b0b4c9aa4 100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -328,7 +328,7 @@ class CI_Config {
$uri = $str;
}
}
- return $uri;
+ return $uri;
}
// --------------------------------------------------------------------