Skip to content
Commit 3faab0ca authored by Marius Cramer's avatar Marius Cramer
Browse files

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
parents 83c58ebb f4de70ad
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment