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	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Remove useless files	2012-04-25 16:10:11 +08:00
helpers	merge with master	2012-01-11 20:31:52 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Fix filter and sort for status in announcement	2012-04-24 00:46:34 +08:00
views	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-25 16:39:26 +08:00