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
commit a31a9c4792
@@ -1,8 +1,6 @@
 class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
  include OrbitCoreLib::PermissionUnility
-  layout "new_admin"
  before_filter :force_order
-
  
  
  def setting