merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -1,5 +1,5 @@
-class Origami::MoveroomController < ApplicationController#BaseOrigamiController
-  
+class Origami::MoveroomController < ApplicationController #BaseOrigamiController
+ 
  authorize_resource :class => false
  
  def move_dining