Context Navigation

photos_add_settings.php

Timestamp:

05/25/10 00:19:41 (3 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:

Property svn:mergeinfo

trunk/admin
- Property svn:mergeinfo set to
  /branches/2.0/admin 4963
  /branches/2.1/admin 6347*
trunk/admin/photos_add_settings.php
- Property svn:mergeinfo set to (toggle deleted branches)
  /branches/2.1/admin/photos_add_settings.php merged eligible
  /branches/2.0/admin/photos_add_settings.php 4963

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

/branches/2.0/admin	4963
/branches/2.1/admin	6347*