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

..

amavis.rst

Merge branch '1.1.x'

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

limits.rst

Split plugins documentation.

2014-08-23 18:45:54 +02:00

overview.rst

Split plugins documentation.

2014-08-23 18:45:54 +02:00

postfix_autoreply.rst

Possibility to deploy a development instance.

2014-10-25 19:36:32 +02:00

postfix_relay_domains.rst

Split plugins documentation.

2014-08-23 18:45:54 +02:00

radicale.rst

wip: Radicale extension.

2014-08-23 19:03:49 +02:00

sievefilters.rst

Split plugins documentation.

2014-08-23 18:45:54 +02:00

statistics.rst

Possibility to deploy a development instance.

2014-10-25 19:36:32 +02:00

webmail.rst

Split plugins documentation.

2014-08-23 18:45:54 +02:00