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
Merge branch 'dev-text2html'
Tags None Referenced Files None Subscribers None
Description Merge branch 'dev-text2html' Conflicts: Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
Details
Event Timeline
Merged Changes
|