diff options
| author | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-04-15 00:49:21 +0200 |
| commit | 8cefb3ff51de4f023753c0146eb16950f48601a9 (patch) | |
| tree | ed868ec7a795fcf1fe97efc5642d26dc1d1faefe /application/controllers/welcome.php | |
| parent | 0760a48d431fb9ab85f2a0ca9af63aa131e29520 (diff) | |
| parent | 0f2211711deceb74157d6811116acc0376d3157d (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/form_error_msgs
Conflicts:
system/language/english/form_validation_lang.php
Diffstat (limited to 'application/controllers/welcome.php')
| -rw-r--r-- | application/controllers/welcome.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index 5eb0e9625..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.1.6 or newer + * 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 |