diff options
| author | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
|---|---|---|
| committer | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
| commit | 6949f95f6e21980f36095490bf38fc8a172dbc0f (patch) | |
| tree | b3141f390acd0051396cda6a3da51c1f98384cca /application/config/routes.php | |
| parent | 68a02a01a086bbb1b8128ea2744439de84873d11 (diff) | |
| parent | 81f036753272391360ba5b64e6dd93c4101a8733 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
system/helpers/form_helper.php
Diffstat (limited to 'application/config/routes.php')
| -rw-r--r-- | application/config/routes.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/application/config/routes.php b/application/config/routes.php index 3078c3c76..572f87e35 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -18,12 +18,13 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) * @link http://codeigniter.com * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); /* | ------------------------------------------------------------------------- |