diff options
author | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
---|---|---|
committer | Darren Hill <dchill42@gmail.com> | 2011-09-01 13:43:38 +0200 |
commit | 826675178c2c2ad697e5ac55161645abd9143bef (patch) | |
tree | df07f67a43b7467447549dfd7bd6b9e401e670ae /application/config/routes.php | |
parent | a2ae6571e55d5a3d23645e96929eea996e9f0499 (diff) | |
parent | 886d87c616bd422585c6a1190b0e1b72bc661269 (diff) |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
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'; | |