diff options
| author | plegall <plg@piwigo.org> | 2016-03-08 10:51:10 +0100 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2016-03-08 10:51:10 +0100 |
| commit | 2e071ba4a17cfb4e4ea0ab6e50516ddac5e0ae90 (patch) | |
| tree | 681f9b4cbbed109beb41ca4babf0662dc814f8c4 /admin/cat_options.php | |
| parent | d80d853a23119bd21c20ad92024cba5dce47e7d4 (diff) | |
merge --squash from translation up to f9fecd0be09ea6da405f1ab2a09e09bc51312dd4
git merge --squash is simpler for the first time, then we plan to do cherry-pick
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions