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
..
panel/announcement	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
application_controller.rb	merge with master	2012-01-11 20:31:52 +08:00