diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
| commit | 94c6b1f1c02466178c1f8e144542d753f27dd3d8 (patch) | |
| tree | 8e8ca4b8383e2481b0a689fd07fc230013531822 /system/language/english/upload_lang.php | |
| parent | 6581cac4d2b5fef69478ce1a5c3464200bfcbba5 (diff) | |
| parent | c78e56a7df140ee777ffc67687877f3e70c77e28 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'system/language/english/upload_lang.php')
| -rw-r--r-- | system/language/english/upload_lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php index 4fa8394ec..c3cb9c3e8 100644 --- a/system/language/english/upload_lang.php +++ b/system/language/english/upload_lang.php @@ -5,9 +5,9 @@ * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: |