Orbit/app
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
..
assets Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-25 16:39:26 +08:00
controllers Change ad_banner preview from using title to id 2012-04-25 16:10:11 +08:00
helpers Remove .erb when including css 2012-04-25 15:44:44 +08:00
models Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner 2012-04-24 14:43:30 +08:00
uploaders Modifications for images in html code 2011-10-18 11:21:24 +08:00
views Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-04-25 16:39:26 +08:00