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 /tests/phpunit.xml | |
| 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 'tests/phpunit.xml')
| -rw-r--r-- | tests/phpunit.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/phpunit.xml b/tests/phpunit.xml index cee3434c1..f3df53521 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -40,6 +40,7 @@ <file>Framework/SpellcheckPspell.php</file> <file>Framework/Spellchecker.php</file> <file>Framework/StringReplacer.php</file> + <file>Framework/Text2Html.php</file> <file>Framework/User.php</file> <file>Framework/Utils.php</file> <file>Framework/VCard.php</file> |