Till Brehm
2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c
refs
author Till Brehm <tbrehm@ispconfig.org>
Thursday, May 19, 2016 05:01 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Thursday, May 19, 2016 05:01 -0400
commitdc7aa0813f52eed4eb039a21ee13d6a5cb7f104c
tree 3658ee0f79c6727cbcbeb084b3c6feaf7d4f7e42 tree | zip | gz
parent 9d3f20bb3ef7391c94eae54ddf3750bcc181678e view | diff
2b8e5192a019e6dd08f290aaa781ac5426ea4bcf view | diff
Merge branch 'master' into 'stable-3.1'

Fixes: #3899



See merge request !341
2 files added
2 files modified
356 ■■■■■ changed files
install/dist/conf/centos72.conf.php 219 ●●●●● diff | view | raw | blame | history
install/dist/lib/centos72.lib.php 125 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_spf_edit.php 6 ●●●● diff | view | raw | blame | history