modoboa

mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00

Files

T

Antoine Nguyen 25cd707490 Merge branch 'update-template-585' of https://github.com/Toc-Toc/modoboa into Toc-Toc-update-template-585

Conflicts:
	modoboa/core/app_settings.py
	modoboa/extensions/admin/static/admin/js/admin.js
	modoboa/extensions/admin/views/domain.py
	modoboa/extensions/admin/views/identity.py
	modoboa/extensions/amavis/app_settings.py
	modoboa/extensions/amavis/general_callbacks.py
	modoboa/static/js/global.js
	modoboa/static/js/listing.js
	modoboa/templates/common/generic_modal.html
	modoboa/templates/common/wizard_forms.html
	modoboa/templates/nlayout.html

2014-08-25 19:33:57 +02:00

core

Merge branch 'update-template-585' of https://github.com/Toc-Toc/modoboa into Toc-Toc-update-template-585

2014-08-25 19:33:57 +02:00

demo

Wrong import statement fixed.

2014-01-02 16:23:52 +01:00

extensions

Merge branch 'update-template-585' of https://github.com/Toc-Toc/modoboa into Toc-Toc-update-template-585

2014-08-25 19:33:57 +02:00

lib

Merge branch 'update-template-585' of https://github.com/Toc-Toc/modoboa into Toc-Toc-update-template-585