Files
roundcubemail/program/include/rcmail.php
Aleksander Machniak 731d190fec Merge branch 'tinymce4'
Conflicts:
	program/js/app.js
	program/js/editor.js
	program/js/tiny_mce/tiny_mce.js
	program/steps/utils/spell_html.inc
2014-05-28 15:52:30 +02:00

70 KiB