diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-01-20 14:03:43 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-01-20 14:03:43 +0100 |
| commit | ea801ab4ab80042638ffddc6056483a1ec43fa80 (patch) | |
| tree | f75f30c0df6a8f861ca7df22af09fa3240b0bbd6 /application/controllers | |
| parent | 1c08d557a21ecb0f79cd1a1de4e06817a26e0537 (diff) | |
| parent | 4d0571666d03511ac5b4a1f2a6882ccb1509a209 (diff) | |
Merge branch 'develop' into feature/user-guide-cleanup
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/Welcome.php (renamed from application/controllers/welcome.php) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/Welcome.php index 2f0e358bc..31ceea948 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/Welcome.php @@ -50,4 +50,4 @@ class Welcome extends CI_Controller { } /* End of file welcome.php */ -/* Location: ./application/controllers/welcome.php */
\ No newline at end of file +/* Location: ./application/controllers/Welcome.php */
\ No newline at end of file |