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
..
assets	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00
controllers	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00
helpers	Remove .erb when including css	2012-04-25 15:44:44 +08:00
models	Merge branch 'design_team' into ldap	2012-04-24 15:28:52 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00