• Jonny Bradley's avatar
    [MRG] Automatic merge, branches/7.x 35090 to 35187 · 32eb34e7
    Jonny Bradley authored
    Conflicts occured during the merge. (hopefully correctly fixed - authors please check - remember: whitespace counts!)
    	tiki-edit_draw.php
    	lib/setup/prefs.php
    	lib/webmail/tikimaillib.php
    	lib/prefs/email.php
    	templates/tiki-admin_include_general.tpl
    32eb34e7
tiki-rollback.php 1.94 KB