Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb		2012-04-25 16:45:04 +08:00
..
built_in_modules	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00