ISPConfig3 devel
parent: 54f105 | patch | commitdiff
Marius Cramer
2015-04-30 57496f7c08945031b90b1e4bc5b2e0d5f4c2cec4
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, April 30, 2015 08:49 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, April 30, 2015 08:49 -0400
commit57496f7c08945031b90b1e4bc5b2e0d5f4c2cec4
tree 1e2ab643e058e27fb3c6f542704ad44ae101db24 tree | zip | gz
parent 54f105466f1ac43426771a72787c29c1787ceea9 view | diff
465dd856212f0f7dc0e57087a7a54a3b46263dab view | diff 
Merge branch 'renky/ispconfig3-mdbox-format'

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
35 files modified
1 files added
576 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 1 ●●●●● diff | view | raw | blame | history
install/tpl/debian6_dovecot-sql.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/debian_dovecot-sql.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/fedora_dovecot-sql.conf.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/opensuse_dovecot-sql.conf.master 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_mail_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_edit.php 10 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php 60 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/600-purge_mailboxes.inc.php 77 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 69 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 307 ●●●●● diff | view | raw | blame | history