summaryrefslogtreecommitdiffstats
path: root/application/controllers/welcome.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-26 20:51:00 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-26 20:51:00 +0200
commit925d37391789405f53da73979305dead6a053099 (patch)
tree0ed90207fe66bb5491e8925d20d48c211a897cf8 /application/controllers/welcome.php
parente6f7d610b189e243ad48dcc3900a5c53cab2498d (diff)
parent84c3b27fface58ecfcd0acf7172d3ee2043b3673 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-acc
Diffstat (limited to 'application/controllers/welcome.php')
-rw-r--r--application/controllers/welcome.php10
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