merge r6361 from branch 2.1 to trunk

feature 1697: ability to deactivate the synchronization method to add photos.


git-svn-id: http://piwigo.org/svn/trunk@6365 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-05-26 00:20:07 +00:00
parent 9cf8684aa0
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions
+3
View File
@@ -780,4 +780,7 @@ $conf['ploader_download_mac'] = 'http://piwigo.org/ext/download.php?eid=353';
// pLoader direct download url for linux
$conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269';
// enable the synchronization method for adding photos
$conf['enable_synchronization'] = true;
?>