diff options
| author | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-04 22:59:52 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal.kriete@ellislab.com> | 2010-11-04 22:59:52 +0100 |
| commit | e917f9be8b05c81357c1c2c9730d5060685d644d (patch) | |
| tree | b6a7d5ce8ba57b69ba61454f77829b04f2ce5974 /application/controllers/welcome.php | |
| parent | 5b2d2da5ae2e97043c6bef53e565d30e50196e2b (diff) | |
| parent | e1f6e9ddff788f6a154f5f35dc117d14aeb0c484 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'application/controllers/welcome.php')
| -rw-r--r-- | application/controllers/welcome.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index bd134e7e6..2e4cff8ed 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -4,9 +4,9 @@ class Welcome extends Controller { function Welcome() { - parent::Controller(); + parent::Controller(); } - + function index() { $this->load->view('welcome_message'); |