Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/helpers/application_helper.rb app/models/ad_banner.rb		2012-05-16 12:13:07 +08:00
..
built_in_modules	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-16 12:13:07 +08:00
impressionist	Add vendor/impressionist	2012-05-15 22:42:49 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00