diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-11 09:09:52 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-11 09:09:52 -0700 |
| commit | 329abfe539371b65c95e3334e436f997ec92879f (patch) | |
| tree | 0a3ee6e19be8563af6b6b6d87db795a0e6f463e2 /modules/organize | |
| parent | 213807a8073138a98b8daf9fe265e981454aaa50 (diff) | |
| parent | 0389dceb475597ecdedf519d27d6d7bb36aa6276 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/organize')
| -rw-r--r-- | modules/organize/controllers/organize.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index ebd40c8d..0e647e09 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -34,7 +34,7 @@ class Organize_Controller extends Controller { $file_filter = json_encode( array("photo" => array("label" => "Images", "types" => array("*.jpg", "*.jpeg", "*.png", "*.gif")), - "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4")))); + "movie" => array("label" => "Movies", "types" => array("*.flv", "*.mp4", "*.m4v")))); $v = new View("organize_dialog.html"); $v->album = $album; |