summaryrefslogtreecommitdiff
path: root/system/config/mimes.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
commit10c05c855a1634a60048a52e8d90bc51f187ede7 (patch)
treeb65a9d3b2f2213503e3f143b18af6ebd831bc554 /system/config/mimes.php
parent058a84ed76df96aeb6ec082d16fe0d8f317faac2 (diff)
parentded8fc593cccaf66236fb271a6d3f962d8c4b337 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'system/config/mimes.php')
-rw-r--r--system/config/mimes.php8
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'),