Christophe Vilayphiou a47ef5cfe8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb		2012-04-24 16:45:13 +08:00
..
locales	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner	2012-04-24 16:45:13 +08:00
routes.rb	R4-Billingual	2012-04-24 16:43:45 +08:00