github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-11-15 09:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
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
This commit is contained in:
Antoine Nguyen
2014-11-10 10:56:39 +01:00
parent b571194e47 e263d4d600
commit f80141bcb8
46 changed files with 4167 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/getting_started/upgrade.rst
+8
View File
@@ -51,6 +51,14 @@ Then, follow the common procedure::
Eventually, restart the web server process according to the environment
you did choose. See :ref:`webservers` for more details.
1.1.7: manual learning for SpamAssassin
=======================================
A new feature allows administrators and users to manually train
SpamAssassin in order to customize its behaviour.
Check :ref:`sa_manual_learning` to know more about this feature.
1.1.6: Few bugfixes
===================