Skip to content
Snippets Groups Projects
  • Till Brehm's avatar
    5f47687b
    Merge branch 'develop' into '6552-mail_quota_show' · 5f47687b
    Till Brehm authored
    # Conflicts:
    #   interface/web/mail/lib/lang/ar_mail_user.lng
    #   interface/web/mail/lib/lang/bg_mail_user.lng
    #   interface/web/mail/lib/lang/br_mail_user.lng
    #   interface/web/mail/lib/lang/ca_mail_user.lng
    #   interface/web/mail/lib/lang/cn_mail_user.lng
    #   interface/web/mail/lib/lang/cz_mail_user.lng
    #   interface/web/mail/lib/lang/de_mail_user.lng
    #   interface/web/mail/lib/lang/dk_mail_user.lng
    #   interface/web/mail/lib/lang/el_mail_user.lng
    #   interface/web/mail/lib/lang/en_mail_user.lng
    #   interface/web/mail/lib/lang/es_mail_user.lng
    #   interface/web/mail/lib/lang/fi_mail_user.lng
    #   interface/web/mail/lib/lang/fr_mail_user.lng
    #   interface/web/mail/lib/lang/hr_mail_user.lng
    #   interface/web/mail/lib/lang/hu_mail_user.lng
    #   interface/web/mail/lib/lang/id_mail_user.lng
    #   interface/web/mail/lib/lang/it_mail_user.lng
    #   interface/web/mail/lib/lang/ja_mail_user.lng
    #   interface/web/mail/lib/lang/nl_mail_user.lng
    #   interface/web/mail/lib/lang/pl_mail_user.lng
    #   interface/web/mail/lib/lang/pt_mail_user.lng
    #   interface/web/mail/lib/lang/ro_mail_user.lng
    #   interface/web/mail/lib/lang/ru_mail_user.lng
    #   interface/web/mail/lib/lang/se_mail_user.lng
    #   interface/web/mail/lib/lang/sk_mail_user.lng
    #   interface/web/mail/lib/lang/tr_mail_user.lng
    #   interface/web/mail/mail_user_edit.php
    5f47687b
    History
    Merge branch 'develop' into '6552-mail_quota_show'
    Till Brehm authored
    # Conflicts:
    #   interface/web/mail/lib/lang/ar_mail_user.lng
    #   interface/web/mail/lib/lang/bg_mail_user.lng
    #   interface/web/mail/lib/lang/br_mail_user.lng
    #   interface/web/mail/lib/lang/ca_mail_user.lng
    #   interface/web/mail/lib/lang/cn_mail_user.lng
    #   interface/web/mail/lib/lang/cz_mail_user.lng
    #   interface/web/mail/lib/lang/de_mail_user.lng
    #   interface/web/mail/lib/lang/dk_mail_user.lng
    #   interface/web/mail/lib/lang/el_mail_user.lng
    #   interface/web/mail/lib/lang/en_mail_user.lng
    #   interface/web/mail/lib/lang/es_mail_user.lng
    #   interface/web/mail/lib/lang/fi_mail_user.lng
    #   interface/web/mail/lib/lang/fr_mail_user.lng
    #   interface/web/mail/lib/lang/hr_mail_user.lng
    #   interface/web/mail/lib/lang/hu_mail_user.lng
    #   interface/web/mail/lib/lang/id_mail_user.lng
    #   interface/web/mail/lib/lang/it_mail_user.lng
    #   interface/web/mail/lib/lang/ja_mail_user.lng
    #   interface/web/mail/lib/lang/nl_mail_user.lng
    #   interface/web/mail/lib/lang/pl_mail_user.lng
    #   interface/web/mail/lib/lang/pt_mail_user.lng
    #   interface/web/mail/lib/lang/ro_mail_user.lng
    #   interface/web/mail/lib/lang/ru_mail_user.lng
    #   interface/web/mail/lib/lang/se_mail_user.lng
    #   interface/web/mail/lib/lang/sk_mail_user.lng
    #   interface/web/mail/lib/lang/tr_mail_user.lng
    #   interface/web/mail/mail_user_edit.php