ISPConfig3 devel
parent: f0bed3 | patch | commitdiff
Marius Cramer
2014-02-07 d4d1ead7754ed394f5d429c58dc313c0d2c07046
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, February 7, 2014 08:18 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, February 7, 2014 08:18 -0500
commitd4d1ead7754ed394f5d429c58dc313c0d2c07046
tree bd6461701f5f88d680fba2bbe3c278e45d364d97 tree | zip | gz
parent f0bed3a1dd147e85ce4f3d0e41a8142fc050960e view | diff
42b689d1a0b6cd091f4f97ecdc3f841c964b82ed view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/tpl.inc.php
	interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
	interface/web/mail/lib/lang/de_spamfilter_users.lng
	interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
	server/lib/classes/tpl.inc.php
17 files modified
1 files added
977 ■■■■■ changed files
install/sql/incremental/upd_0067.sql 7 ●●●●● diff | view | raw | blame | history
interface/lib/classes/ispcmail.inc.php 80 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tpl.inc.php 33 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_blacklist.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_users.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/spamfilter_whitelist.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_blacklist.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_users.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_whitelist.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_blacklist.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_users.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_spamfilter_whitelist.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_stats.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_sites_stats.php 2 ●●●●● diff | view | raw | blame | history
server/conf/apache_apps.vhost.master 12 ●●●●● diff | view | raw | blame | history
server/conf/apache_ispconfig.conf.master 60 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 60 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl.inc.php 697 ●●●●● diff | view | raw | blame | history