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
..
_registration.html.erb	Integration of module_app workflow	2011-11-19 14:33:26 +08:00
_update.html.erb	ika's modification to the backend	2011-11-16 18:34:54 +08:00
index.html.erb	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
language.html.erb	Add site_info	2012-05-07 00:54:18 +08:00
mail_setting.html.erb	Add site_info	2012-05-07 00:54:18 +08:00
new.html.erb	Clean code for layout and modifications in dev.rake	2011-08-22 13:45:21 +08:00
site_info.html.erb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-07 16:08:05 +08:00
system_info.html.erb	Add site_info	2012-05-07 00:54:18 +08:00
ui_theme.html.erb	Add site_info	2012-05-07 00:54:18 +08:00