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
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions

View file

@ -20,6 +20,7 @@ galerie :</p>
<p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Utiliser pLoader</a></p>
<div id="helpSynchro">
<ul>
<li><strong>Le transfert FTP</strong>
est la méthode idéale pour ajouter une collection importante en un minimum
@ -29,3 +30,4 @@ galerie :</p>
</ul>
<p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Utiliser FTP</a></p>
</div>