diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-07 10:41:19 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-07 10:41:19 -0800 |
| commit | c711bf1b1fcf7840467a7a044b1f511e7b69c139 (patch) | |
| tree | ee84a16b5ce4448fd41ba7ffa2cb2381b225e206 /system/config/mimes.php | |
| parent | 31454d37b3ea02104925f1976609576c5f09c0c6 (diff) | |
| parent | 10c05c855a1634a60048a52e8d90bc51f187ede7 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
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'), |