Antoine Nguyen 68bcc4dfbb Merge branch '1.2.x' ...

Conflicts:
	modoboa/extensions/limits/tests.py
	modoboa/lib/permissions.py

2015-03-11 13:35:21 +01:00

..

admin

Merge branch '1.2.x'

2015-03-11 13:35:21 +01:00

amavis

Merge branch '1.2.x'

2015-02-18 11:12:38 +01:00

limits

Merge branch '1.2.x'

2015-03-11 13:35:21 +01:00

postfix_autoreply

Remove old south migrations.

2015-02-03 09:21:45 +01:00

postfix_relay_domains

Merge branch '1.2.x'

2015-02-19 13:51:54 +01:00

radicale

Unit tests fixed.

2015-02-02 14:21:39 +01:00

sievefilters

Merge branch '1.2.x'

2015-02-11 14:01:24 +01:00

stats

Unit tests fixed.

2015-02-02 14:21:39 +01:00

webmail

PEP8 fixes

2015-03-11 10:25:27 +01:00

__init__.py

wip: big refactoring

2013-08-14 15:43:16 +02:00