Context Navigation

photos_add_ftp.php

Timestamp:

May 25, 2010, 12:19:41 AM (15 years ago)

Author:

plg

Message:

merge r6347 from branch 2.1 to trunk

bug 1672: replace the language key where it's used.

Location:

trunk

Files:

trunk
- Property svn:mergeinfo changed (with no actual effect on merging)
trunk/admin
- Property svn:mergeinfo set to
  /branches/2.0/admin merged eligible
  /branches/2.1/admin merged non-inheritable eligible
trunk/admin/photos_add_ftp.php
- Property svn:mergeinfo set to (toggle deleted branches)
  /branches/2.1/admin/photos_add_ftp.php merged eligible
  /branches/2.0/admin/photos_add_ftp.php 4963

Note: See TracChangeset for help on using the changeset viewer.

/branches/2.0/admin	merged	eligible
/branches/2.1/admin	merged	non-inheritable	eligible

/branches/2.1/admin/photos_add_ftp.php	merged	eligible
/branches/2.0/admin/photos_add_ftp.php	4963