# Conflicts: # adm/shop_admin/orderform.php # bbs/register_form_update.php # lib/common.lib.php # mobile/shop/personalpayform.sub.php # plugin/htmlpurifier/extend.video.php # plugin/kcaptcha/kcaptcha.lib.php # shop/orderformupdate.php # skin/social/social_register_member.skin.php # version.php