merged master

2018-05-04 11:16:44 +06:30
parent 44ac3bcd0c 8cc81a6bad
commit fc69efff16
15 changed files with 455 additions and 207 deletions
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -22,7 +22,7 @@ class BaseOrigamiController < ActionController::Base
          message: "User using other device!"          
        }.to_json
      end
-    else 
+    else       
      if current_user.nil?
        redirect_to root_path    
      end