Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner ... Conflicts: app/views/admin/ad_banners/_ad_image_update.html.erb		2012-04-13 16:52:14 +08:00
..
admin	Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner	2012-04-13 16:52:14 +08:00
devise	Remove class 'error' in devise forms	2012-02-29 04:56:32 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
layouts	Fix side_bar.	2012-04-12 18:14:00 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00