diff options
| author | plegall <plg@piwigo.org> | 2014-10-06 09:28:37 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2014-10-06 09:28:37 +0000 |
| commit | 83f267dc95eddb11e32e3e51984589615872c84a (patch) | |
| tree | 1c07fb7a1b4731a0bafd9b449fb69233b7cfe4cc /admin/include/configuration_watermark_process.inc.php | |
| parent | acda99cf4d1d988e88e1d89151f059b23208a848 (diff) | |
merge r29901 from trunk to branch 2.7
bug 3156 fixed: avoid warning on PHP 5.2 for nl2br second parameter
git-svn-id: http://piwigo.org/svn/branches/2.7@29902 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/configuration_watermark_process.inc.php')
0 files changed, 0 insertions, 0 deletions