diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-26 12:58:12 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-26 12:58:12 +0200 |
| commit | bb2e518754e703be095df9d8fd7cb3d82a5d3bbe (patch) | |
| tree | ab2ed2e5e9b9d4ef66fb30cb221c43a8ef693cdc /application/controllers/welcome.php | |
| parent | 0336dc228c84695ec75fc8dccedac354d1556de9 (diff) | |
| parent | e684bdac2d6282e3b9a5c57e1006d5ed1664f647 (diff) | |
Merge upstream branch
Diffstat (limited to 'application/controllers/welcome.php')
| -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 |