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
..
built_in_modules	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner	2012-04-24 16:45:13 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00