ISPConfig3 devel
parent: 0b2c41 | patch | commitdiff
Marius Burkard
2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, April 20, 2016 10:58 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, April 20, 2016 10:58 -0400
commit4569cae57f127afd093794310ccd290d2d9fdf36
tree decc9a7b15fcd55c0d9f353da4c9adbc1b281d64 tree | zip | gz
parent 0b2c4118a0894f722318ae4d861baddb8f66fd4d view | diff
1d46a3ad84e84fd5737ee5e482fbe154f4ad9448 view | diff 
Merge branch 'stable-3.1'
23 files modified
270 ■■■■■ changed files
interface/lib/classes/tpl.inc.php 6 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_autoresponder.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/remote_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/users_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_mailinglist_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_user_mailbox_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/xmpp_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/templates/mail_user_password_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/shell_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_folder_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_stats.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/webdav_user_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/stylesheets/ispconfig.css 12 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/stylesheets/ispconfig.min.css 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/user_settings.htm 12 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl.inc.php 6 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 16 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 44 ●●●●● diff | view | raw | blame | history