diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-09 23:02:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-09 23:02:55 +0000 |
| commit | 0a67b836a9b5021c91b9c327d3693991c3248dfc (patch) | |
| tree | 91f49ca62a9ffd586e01bde700068f87e884181a /system/config/mimes.php | |
| parent | 232c0b7fd0df7f84543bc29380a0734ef1e84a02 (diff) | |
| parent | bd9f945e3f2de4ea2402bd3941dba69c79ddc5a4 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system/config/mimes.php')
| -rw-r--r-- | system/config/mimes.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/system/config/mimes.php b/system/config/mimes.php index c4318d58..f8f8aaf0 100644 --- a/system/config/mimes.php +++ b/system/config/mimes.php @@ -1,14 +1,18 @@ <?php defined('SYSPATH') OR die('No direct access allowed.'); /** - * @package Core - * * A list of mime types. Our list is generally more complete and accurate than * the operating system MIME list. * * If there are any missing options, please create a ticket on our issue tracker, * http://dev.kohanaphp.com/projects/kohana2. Be sure to give the filename and * expected MIME type, as well as any additional information you can provide. + * + * @package Kohana + * @author Kohana Team + * @copyright (c) 2007-2009 Kohana Team + * @license http://kohanaphp.com/license */ + $config = array ( '323' => array('text/h323'), |