interface/web/client/lib/lang/de.lng · 4039c82a3dee9c57e328c9dc369365b43ca39046 · Manoa Ratefiarison / ISPConfig 3

Source project has a limited visibility.

11 years ago

Merge remote-tracking branch 'origin/stable-3.0.5' · cf646e99

Marius Cramer authored 11 years ago

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_domain_edit.php
	server/lib/classes/monitor_tools.inc.php
	server/plugins-available/maildeliver_plugin.inc.php

cf646e99

History

Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer authored 11 years ago

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_domain_edit.php
	server/lib/classes/monitor_tools.inc.php
	server/plugins-available/maildeliver_plugin.inc.php