stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-02 13:10:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2010-07-11 09:09:52 -07:00
parent 213807a807 0389dceb47
commit 329abfe539
14 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/organize/controllers/organize.php
+1 -1
View File
@@ -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;