gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2016-06-17 522bede75fce4a0e3a7d2c7eff1eee198b900a22

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Friday, June 17, 2016 04:18 -0400
committer	Till Brehm <tbrehm@ispconfig.org>
	Friday, June 17, 2016 04:18 -0400
commit	522bede75fce4a0e3a7d2c7eff1eee198b900a22
tree	ced3aea6eb7cd284997e70e3a0a2346e9cda82a1 tree \| zip \| gz
parent	b5e780aa3f513f342d2909efc565d27cee240bb5 view \| diff 0ea7b959fb7efd0ee136a767937b63acd94006ac view \| diff

Merge branch 'master' into 'stable-3.1'

add translations to list-files



See merge request !357

32 files modified

	interface/web/admin/list/server_ip_map.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_alias.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_aliasdomain.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_blacklist.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_content_filter.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_domain.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_domain_catchall.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_forward.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_get.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_relay_recipient.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_spamfilter.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_transport.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_user.list.php	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/mail_whitelist.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/spamfilter_blacklist.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/spamfilter_policy.list.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/spamfilter_users.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/spamfilter_whitelist.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/xmpp_domain.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/cron.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/database.list.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/ftp_user.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/shell_user.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_childdomain.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_folder.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_folder_user.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/web_vhost_domain.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/webdav_user.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/list/openvz_ip.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/list/openvz_ostemplate.list.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/list/openvz_template.list.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/list/openvz_vm.list.php	2 ●●●●● diff \| view \| raw \| blame \| history