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
..
admin	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-25 16:39:26 +08:00
devise	fix useless notice at login	2012-04-25 16:10:11 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
layouts	Fix side_bar after Matt's changes in translation	2012-04-24 17:00:33 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00