Christophe Vilayphiou 5a423178e3 Merge branch 'design_team' into ldap ... Conflicts: app/assets/stylesheets/new_admin.css.erb app/assets/stylesheets/widget.css		2012-04-23 15:16:50 +08:00
..
built_in_modules	Merge branch 'design_team' into ldap	2012-04-23 15:16:50 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00