Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/helpers/admin/item_helper.rb		2012-05-11 18:09:34 +08:00
..
_site_map_left_bar.html.erb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-11 18:09:34 +08:00
index.html.erb	Remove js from html	2011-12-05 10:36:25 +08:00
index.js.erb	Fix missing modification for "panel_main" to "back_main"	2011-12-29 17:49:48 +08:00