Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

2017-10-23 11:50:09 +06:30
parent b989b78442 1147b81a8a
commit 58b180adc4
5 changed files with 31 additions and 1 deletions
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ShiftsController < ApplicationController#BaseOrigamiController
+class Origami::ShiftsController < BaseOrigamiController
  def index
  end