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

..

common

Merge branch 'master' into feature/radicale

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

registration

libextras renamed to lib_tags.

2013-10-09 15:29:04 +02:00

404.html

Final CSS styles.

2013-01-10 20:38:17 +01:00

500.html

Final CSS styles.

2013-01-10 20:38:17 +01:00

fixed.html

Making Modoboa a standard django application.

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

fluid.html

Making Modoboa a standard django application.

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

layout_simple.html

bootstrap-datepicker.js -> bootstrap-datetimepicker.js

2014-08-13 11:44:29 +02:00

nlayout.html

Merge branch 'master' into feature/radicale

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

twocols.html

libextras renamed to lib_tags.

2013-10-09 15:29:04 +02:00