diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/config/view.php | |
parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/config/view.php')
-rw-r--r-- | system/config/view.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/system/config/view.php b/system/config/view.php index 6bed22e0..a77af878 100644 --- a/system/config/view.php +++ b/system/config/view.php @@ -3,6 +3,7 @@ * @package Core * * Allowed non-php view types. Most file extensions are supported. + * Do not forget to add a valid MIME type in mimes.php */ $config['allowed_filetypes'] = array ( |