diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-09-06 20:40:34 +0200 |
| commit | f22ce8f368e64b1c343e06427e8dad1ab1cef2a4 (patch) | |
| tree | f0552e9318a541e82c3375646fc870490d835e12 /application/config/routes.php | |
| parent | 36fb8de7bf385036f3145dd1fbd9537f6a01ac36 (diff) | |
| parent | 40d1a7684444f6a8eb4cda23d8822f0b258f0c3e (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/routes.php')
| -rw-r--r-- | application/config/routes.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/routes.php b/application/config/routes.php index 5f9a58343..f30a0d1f2 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -23,7 +23,7 @@ | RESERVED ROUTES | ------------------------------------------------------------------------- | -| There area two reserved routes: +| There are two reserved routes: | | $route['default_controller'] = 'welcome'; | |