Christophe Vilayphiou 308cfc7cf2 Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb		2012-04-24 02:46:06 +08:00
..
announcement	Merge branch 'design_team' into ldap	2012-04-24 02:46:06 +08:00
page_content	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-04-05 15:24:39 +08:00
web_resource	Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:31:05 +08:00