gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-06-27 3ba59d59a2ad4068d78753635531b7625c916258

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Saturday, June 27, 2015 14:17 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Saturday, June 27, 2015 14:17 -0400
commit	3ba59d59a2ad4068d78753635531b7625c916258
tree	024e52ce0943bfbae2fd2731e3196aae30126fd7 tree \| zip \| gz
parent	dc679e382b6f60405861ae888c1b560c5117f0e8 view \| diff 3fa4439583c61c28737848cbce7e02b6ebadad5a view \| diff

Merge branch 'master' into 'master'

add missing wb-entry

See merge request !204

49 files modified

	install/tpl/server.ini.master	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_config_dns_edit.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/bind_plugin.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history