ISPConfig3 devel
parent: f611ab | patch | commitdiff
Marius Burkard
2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87
refs
author Marius Burkard <m.burkard@pixcept.de>
Sunday, January 31, 2016 10:00 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Sunday, January 31, 2016 10:00 -0500
commit3117f2e70389b0a3e03a683ec8b03e4e0a7eea87
tree c9c4519a7043f74fec1b7ae50cdee75fb786b150 tree | zip | gz
parent f611abe17c1db9d736bbfb6b12b4711c70e9e365 view | diff
06a34758d293106e918f01adf1c6975a24d331bb view | diff 
Merge branch 'stable-3.1'
1 files added
19 files modified
274 ■■■■■ changed files
install/lib/install.lib.php 3 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 17 ●●●●● diff | view | raw | blame | history
install/update.php 28 ●●●●● diff | view | raw | blame | history
interface/lib/config.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/mail_user_filter_plugin.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 133 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 11 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_message.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 11 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_admin_list.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_list.htm 3 ●●●●● diff | view | raw | blame | history
server/conf/php-fcgi-starter.master 2 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 3 ●●●●● diff | view | raw | blame | history
server/scripts/ispconfig_update.php 5 ●●●●● diff | view | raw | blame | history
server/scripts/update_from_dev_stable.sh 29 ●●●●● diff | view | raw | blame | history