Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/web/sites/lib/lang/de_web_folder.lng interface/web/sites/lib/lang/de_web_folder_user.lng interface/web/sites/lib/lang/de_web_vhost_domain.lng interface/web/sites/lib/lang/en_web_domain.lng server/lib/classes/db_mysql.inc.php
Please register or sign in to comment