Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/models/display_image.rb
+++ b/app/models/display_image.rb
@@ -1,3 +1,3 @@
 class DisplayImage < ApplicationRecord
-    belongs_to :shop
+	belongs_to :shop
 end