Marius Burkard
2016-07-05 ec0634332c118fbcd9e30e41563ee669ccf0d787
refs
author Marius Burkard <m.burkard@pixcept.de>
Tuesday, July 5, 2016 11:55 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Tuesday, July 5, 2016 11:55 -0400
commitec0634332c118fbcd9e30e41563ee669ccf0d787
tree 77dbc6b1f6cf852175361a53d477227b47accdd3 tree | zip | gz
parent 49441bdd0f3ff75d5092d5b832b97ea722a66363 view | diff
3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6 view | diff
Merge branch 'stable-3.1'
1 files added
21 files modified
110 ■■■■■ changed files
.gitignore 1 ●●●● diff | view | raw | blame | history
interface/lib/classes/functions.inc.php 2 ●●● diff | view | raw | blame | history
interface/lib/classes/remoting_lib.inc.php 1 ●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_ip_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/clients_list.htm 4 ●●● diff | view | raw | blame | history
interface/web/client/templates/resellers_list.htm 4 ●●● diff | view | raw | blame | history
interface/web/dashboard/templates/dashboard.htm 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 4 ●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_admin_list.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_edit.htm 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_list.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_user_list.htm 4 ●●● diff | view | raw | blame | history
interface/web/sites/templates/backup_stats_list.htm 12 ●●●● diff | view | raw | blame | history
interface/web/sites/templates/cron_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_admin_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_admin_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 2 ●●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 4 ●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 4 ●●●● diff | view | raw | blame | history