Christophe Vilayphiou 894f8764d8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner ... Conflicts: app/views/layouts/_side_bar.html.erb		2012-04-05 17:42:55 +08:00
..
assets	fact_check with Ray's permission check.	2012-04-05 17:41:43 +08:00
controllers	The new AdBanner.	2012-04-02 03:04:38 +08:00
helpers	The new AdBanner.	2012-04-02 03:04:38 +08:00
models	The new AdBanner.	2012-04-02 03:04:38 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner	2012-04-05 17:42:55 +08:00