diff options
author | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
commit | efc470f0ac7587707665e92701e3937c9b6cc78d (patch) | |
tree | 6674f2f57526f086e02755142f46901db74469c5 /program/lib/Roundcube/rcube_db_sqlsrv.php | |
parent | f1aaca6807742f7a890db152395d5c293b6e4e66 (diff) | |
parent | c0a5aa5f5ff38ac7b8a650b07c134b7b86deb27f (diff) |
Merge branch 'dev-text2html'
Conflicts:
program/js/app.js
Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
stripslashes from these classes to action files
Diffstat (limited to 'program/lib/Roundcube/rcube_db_sqlsrv.php')
0 files changed, 0 insertions, 0 deletions