Antoine Nguyen f80141bcb8 Merge branch '1.1.x' ...

Conflicts:
	doc/getting_started/plugins.rst
	doc/getting_started/upgrade.rst
	modoboa/extensions/amavis/app_settings.py
	modoboa/extensions/amavis/sql_listing.py
	modoboa/extensions/amavis/templates/amavis/index.html
	modoboa/extensions/amavis/templates/amavis/main_action_bar.html
	modoboa/extensions/amavis/templatetags/amavis_tags.py
	modoboa/extensions/amavis/urls.py
	modoboa/extensions/amavis/views.py
	modoboa/extensions/stats/management/commands/logparser.py
	modoboa/extensions/stats/templates/stats/index.html
	modoboa/extensions/stats/urls.py
	modoboa/extensions/stats/views.py
	modoboa/lib/sysutils.py

2014-11-10 10:56:39 +01:00

..

configuration.rst

Domain/mailbox creation control when importing from LDAP.

2014-08-24 12:27:19 +02:00

install.rst

Update install.rst

2014-07-22 12:19:43 +01:00

upgrade.rst

Merge branch '1.1.x'

2014-11-10 10:56:39 +01:00