svn merge -r1366:1371 from branch 1.6 into trunk

git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2006-06-22 19:21:56 +00:00
commit a08cd1a583
9 changed files with 453 additions and 390 deletions

View file

@ -480,4 +480,11 @@ $conf['nbm_list_all_enabled_users_to_send'] = false;
// Max mails sended on one pass
$conf['nbm_max_treatment_timeout_percent'] = 0.8;
// +-----------------------------------------------------------------------+
// | Set default admin layout |
// +-----------------------------------------------------------------------+
// Must be user setable in future
$conf['admin_layout']='yoga/dark';
?>