gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2015-06-02 6f2d95f4f36043e38b14599f5878af320566f8f4

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, June 2, 2015 07:05 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, June 2, 2015 07:05 -0400
commit	6f2d95f4f36043e38b14599f5878af320566f8f4
tree	19479bbd41e48df0800afb4f5edf893d83356b2f tree \| zip \| gz
parent	daf5a71d75dafb532b442e314d92ea3b7b7b0460 view \| diff 8a74454bb560d019315cb84815ad872b8d6fe997 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !195

5 files modified

53 files added

	install/sql/incremental/upd_dev_collection.sql	15 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	19 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_ip_map.tform.php	92 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_server_ip_map.lng	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_server_ip_map_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/module.conf.php	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/list/server_ip_map.list.php	62 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/server_ip_map_del.php	44 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/server_ip_map_edit.php	108 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/server_ip_map_list.php	46 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_ip_map_edit.htm	44 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_ip_map_list.htm	49 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	9 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	11 ●●●●● diff \| view \| raw \| blame \| history