ISPConfig3 devel
parent: b6a0ab | patch | commitdiff
Marius Burkard
2016-01-20 ec64cf5c39c388c297607ba3ac1424f057eafaee
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, January 20, 2016 04:59 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, January 20, 2016 04:59 -0500
commitec64cf5c39c388c297607ba3ac1424f057eafaee
tree a64f343256c74d2c8fdeb093d42eff617dc09697 tree | zip | gz
parent b6a0ab059e67975984633b1a99446818b3e9ee59 view | diff
6332aca4c482615a2168b3afad3170954b9f36a6 view | diff 
Merge branch 'stable-3.1'
6 files added
13 files modified
583 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 11 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 15 ●●●●● diff | view | raw | blame | history
install/tpl/mysql-virtual_sender_login_maps.cf.master 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/quota_lib.inc.php 61 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/sites.inc.php 15 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_alias.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_forward.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_alias.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_forward.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_alias_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_forward_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/ftp_sites_stats.php 181 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_ftp_sites_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/ftp_sites_stats.list.php 60 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_sites_stats_list.htm 60 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/200-ftplogfiles.inc.php 126 ●●●●● diff | view | raw | blame | history