Christophe Vilayphiou 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb		2012-04-25 16:39:26 +08:00
..
built_in_modules	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-25 16:39:26 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00