Till Brehm
2016-07-11 8e7f89749f427c3ba3fe0929fe3d536acc485302
refs
author Till Brehm <tbrehm@ispconfig.org>
Monday, July 11, 2016 06:54 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Monday, July 11, 2016 06:54 -0400
commit8e7f89749f427c3ba3fe0929fe3d536acc485302
tree c6234624252513308e9d67ee3ddd00d871eb25b3 tree | zip | gz
parent a62af307fd9bf33b34df292120cb73e37d8223da view | diff
1fad40cafb70734c94cf8e5558d739c8956f0b70 view | diff
Merge branch 'master' into 'stable-3.1'

Master



See merge request !376
2 files modified
23 ■■■■■ changed files
interface/lib/classes/tform_base.inc.php 20 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_domain.tform.php 3 ●●●● diff | view | raw | blame | history