diff options
| author | Eric Roberts <eric@cryode.com> | 2012-12-12 14:02:11 +0100 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-12-12 14:02:11 +0100 |
| commit | b9e35f21e1c70b6aa67c47e9244ed83195abc00a (patch) | |
| tree | 64f82db362deeac48cc20d1d1afd80651f36f5a5 /application/config/routes.php | |
| parent | 0b05705c52c3bca7f9b3aee657c888e8ad1ff422 (diff) | |
| parent | 545a7c86701875e1412bcde316e9bcc76d9a23a0 (diff) | |
Merge branch 'refs/heads/develop' into feature/form_error_msgs
Conflicts:
system/language/english/form_validation_lang.php
user_guide_src/source/libraries/form_validation.rst
Signed-off-by: Eric Roberts <eric@cryode.com>
Diffstat (limited to 'application/config/routes.php')
| -rw-r--r-- | application/config/routes.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/routes.php b/application/config/routes.php index 474bda969..d1a4419b7 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -59,12 +59,12 @@ | | $route['404_override'] = 'errors/page_missing'; | -| This route will tell the Router what URI segments to use if those provided -| in the URL cannot be matched to a valid route. +| This route will tell the Router which controller/method to use if those +| provided in the URL cannot be matched to a valid route. | */ -$route['default_controller'] = "welcome"; +$route['default_controller'] = 'welcome'; $route['404_override'] = ''; /* End of file routes.php */ |