stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:/gallery/gallery3

Browse Source 
Conflicts:
	modules/server_add/controllers/admin_server_add.php
This commit is contained in:
Bharat Mediratta
2009-07-02 18:00:22 -07:00
parent 1a5fe42b55 a633c134b7
commit eb5538d135
378 changed files with 24645 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server_add/controllers/server_add.php
+1 -1
View File
@@ -144,7 +144,7 @@ class Server_Add_Controller extends Controller {
"url" => "",
"task" => array(
"id" => -1, "done" => 1, "percent_complete" => 100,
"status" => t("No Eligible files, import cancelled"))));
"status" => t("No eligible files, import cancelled"))));
return;
}