diff options
| author | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-04-26 14:27:35 +0200 |
|---|---|---|
| committer | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-04-26 14:27:35 +0200 |
| commit | d6ce1e936d60487ad8ddd099a040fba7d8f88367 (patch) | |
| tree | 31dcdda9a24e2ed12135659a4e38cb4f35b0af31 /application/views/welcome_message.php | |
| parent | bcee50ff3247dee71d83bf273e52bc10096cd48c (diff) | |
| parent | 9e2d5d130eff40592b49337a8ba4d8c170934de1 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/core/Loader.php
system/database/DB_query_builder.php
system/database/drivers/cubrid/cubrid_driver.php
system/database/drivers/mssql/mssql_driver.php
system/database/drivers/mysql/mysql_driver.php
system/database/drivers/mysqli/mysqli_driver.php
system/database/drivers/oci8/oci8_driver.php
system/database/drivers/odbc/odbc_driver.php
system/database/drivers/pdo/pdo_driver.php
system/database/drivers/postgre/postgre_driver.php
system/database/drivers/sqlite/sqlite_driver.php
user_guide_src/source/changelog.rst
user_guide_src/source/database/query_builder.rst
Diffstat (limited to 'application/views/welcome_message.php')
| -rw-r--r-- | application/views/welcome_message.php | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php index acc36b6d4..45360da60 100644 --- a/application/views/welcome_message.php +++ b/application/views/welcome_message.php @@ -1,13 +1,13 @@ -<?php +<?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: @@ -24,9 +24,7 @@ * @since Version 1.0 * @filesource */ -?> - -<!DOCTYPE html> +?><!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> @@ -75,7 +73,7 @@ #body{ margin: 0 15px 0 15px; } - + p.footer{ text-align: right; font-size: 11px; @@ -84,7 +82,7 @@ padding: 0 10px 0 10px; margin: 20px 0 0 0; } - + #container{ margin: 10px; border: 1px solid #D0D0D0; |