gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Thursday, March 31, 2016 02:09 -0400
committer	Marius Burkard <m.burkard@pixcept.de>
	Thursday, March 31, 2016 02:09 -0400
commit	dbf57dddf7ef07a0168ad0c1d64de0735a9c5804
tree	b0c9ff7c4c092c43fd6603345f495376c5fb8266 tree \| zip \| gz
parent	5e981c0c36166071298a6b82cead9f81310842ab view \| diff 0cf03505396faef31d8438a8f86e57d202ef8058 view \| diff

Merge branch 'master' into 'stable-3.1'

Add Spanish templates to mail notifications

Add templates to Spanish mail notifications

See merge request !303

8 files added

2 files modified

	server/conf/mail/db_quota_notification_de.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_notification_en.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_notification_es.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_ok_notification_es.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/mail_quota_notification_es.txt	14 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/mail_quota_ok_notification_es.txt	14 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/web_quota_notification_es.txt	14 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/web_quota_ok_notification_es.txt	14 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/web_traffic_notification_es.txt	8 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/welcome_email_es.txt	4 ●●●●● diff \| view \| raw \| blame \| history