Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/sites/site_info.html.erb		2012-05-07 16:08:05 +08:00
..
assets	Ray's changes for site_info	2012-05-07 15:55:45 +08:00
controllers	Add site_info	2012-05-07 00:54:18 +08:00
helpers	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-07 16:08:05 +08:00
models	Add menu_enabled_for: the page can be shown even if there's no link in the menu	2012-05-07 15:47:14 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-07 16:08:05 +08:00