ISPConfig3 devel
parent: 8fc75d | patch | commitdiff
Marius Burkard
2016-01-20 6332aca4c482615a2168b3afad3170954b9f36a6
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, January 20, 2016 04:58 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, January 20, 2016 04:58 -0500
commit6332aca4c482615a2168b3afad3170954b9f36a6
tree a64f343256c74d2c8fdeb093d42eff617dc09697 tree | zip | gz
parent 8fc75dace32765ec39358c0f1957318a7c1f31a9 view | diff
b9d4a730dba72ca82013d5fed1c787c6f72d69b5 view | diff 
Merge branch 'darkalex/ispconfig3-mailsec-sendas' into stable-3.1
11 files modified
41 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 6 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 1 ●●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_sender_login_maps.cf.master 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_alias.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_forward.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_alias_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_forward_edit.htm 6 ●●●●● diff | view | raw | blame | history