Antoine Nguyen 2607afc969 Merge branch 'master' into feature/radicale ...

Conflicts:
	modoboa/extensions/amavis/app_settings.py
	tests/install_from_scratch.py

2014-08-23 18:25:25 +02:00

..

core

Merge branch 'master' into feature/radicale

2014-08-23 18:25:25 +02:00

demo

Wrong import statement fixed.

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

extensions

Merge branch 'master' into feature/radicale

2014-08-23 18:25:25 +02:00

lib

Merge branch 'master' into feature/radicale

2014-08-23 18:25:25 +02:00

locale

- Fix typo.

2014-08-08 17:19:54 +02:00

static

Merge branch 'master' into feature/radicale

2014-08-23 18:25:25 +02:00

templates

Merge branch 'master' into feature/radicale

2014-08-23 18:25:25 +02:00

tools

PEP8 compliance.

2013-02-10 20:59:26 +01:00

__init__.py

Making Modoboa a standard django application.

2012-06-20 09:21:10 +02:00

urls.py

wip: relay domains.

2013-10-31 20:35:59 +01:00