diff options
| author | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
|---|---|---|
| committer | purandi <free6300@gmail.com> | 2011-09-04 14:51:23 +0200 |
| commit | ab0dbd4b992778678e00ea3f2a3dd4bf5f1ff504 (patch) | |
| tree | 740d3cabe5e51f18578a72abf6e13e62fba9eb62 /application/config/routes.php | |
| parent | dcf3d1bf17e1354ff0a644f390ed590f2e65298b (diff) | |
| parent | 2eb2557bf1c438d8fb7d612dbb76c6676eaec4d6 (diff) | |
Merge branch 'develop', remote-tracking branch 'origin/develop' 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'; | |