diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
| commit | 26c708514e3ca04a1c373efd166b5c17c31e3796 (patch) | |
| tree | 8c2241630f236733da08770bcbcf9d17461a0f78 /application/controllers | |
| parent | ed1aa21dcd5312b2884f140be8c0d2ee94379423 (diff) | |
| parent | 8f50b6b36cb743be8b70809279e501c20b8e38e2 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driver
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/welcome.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index 2451d9776..1ed82d2a7 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Academic Free License version 3.0 - * + * * This source file is subject to the Academic Free License (AFL 3.0) that is * bundled with this package in the files license_afl.txt / license_afl.rst. * It is also available through the world wide web at this URL: @@ -32,10 +32,10 @@ class Welcome extends CI_Controller { * * Maps to the following URL * http://example.com/index.php/welcome - * - or - + * - or - * http://example.com/index.php/welcome/index * - or - - * Since this controller is set as the default controller in + * Since this controller is set as the default controller in * config/routes.php, it's displayed at http://example.com/ * * So any other public methods not prefixed with an underscore will |