diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-08-08 08:21:45 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-08-08 08:21:45 +0200 |
commit | de56ea1909d515d3e4807a04a6c4644b8226d08d (patch) | |
tree | c8ad7166af152fe14887022e64b8a0de896cdfda /skins/larry/templates/settingsedit.html | |
parent | d55c02ba0334192103344dd54701cec066aa65b5 (diff) | |
parent | c2b20fc0b4c6c1271fff9a85cb977d23de0a3421 (diff) |
Merge branch 'pdo'
Conflicts:
CHANGELOG
Diffstat (limited to 'skins/larry/templates/settingsedit.html')
0 files changed, 0 insertions, 0 deletions