Christophe Vilayphiou de739d7d20 Merge branch 'design_team' into ldap ...

Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json

2012-05-10 00:34:23 +08:00

..

built_in_modules

Merge branch 'design_team' into ldap

2012-05-10 00:34:23 +08:00

plugins

Merge with sub_roles

2011-12-23 18:34:21 +08:00