Antoine Nguyen
|
8c3a1f2203
|
Merge branch 'master' into refactoring
Conflicts:
modoboa/admin/models.py
modoboa/admin/templatetags/admin_extras.py
modoboa/admin/views.py
modoboa/core/app_settings.py
modoboa/extensions/admin/forms.py
modoboa/extensions/admin/tests.py
modoboa/extensions/amavis/views.py
modoboa/extensions/limits/tests.py
modoboa/extensions/postfix_autoreply/models.py
modoboa/extensions/sievefilters/views.py
modoboa/extensions/webmail/fetch_parser.py
modoboa/extensions/webmail/imaputils.py
modoboa/extensions/webmail/lib.py
modoboa/extensions/webmail/templatetags/webextras.py
modoboa/extensions/webmail/views.py
|
2013-09-24 17:18:05 +02:00 |
|