Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ... Conflicts: config/environments/development.rb		2012-05-09 13:51:00 +08:00
..
built_in_modules	Merge branch 'design_team' into ldap	2012-05-09 13:51:00 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00