merge with master

2018-01-09 16:40:45 +06:30
parent 13ec405437 afd893d831
commit 2b50ae5fb9
91 changed files with 2666 additions and 744 deletions
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -84,8 +84,8 @@
                    <%= qid.qty %>
                  </span> ]   
                </p>                  
-
-                <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                
+                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 

                <span class="card-text">
                  <span class="text-muted">Order at -