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

2017-06-18 12:10:30 +06:30
parent f33f11df64 b62d5349c6
commit 74c6f3cebc
13 changed files with 191 additions and 65 deletions
--- a/app/assets/javascripts/CRM.js
+++ b/app/assets/javascripts/CRM.js
@@ -17,4 +17,5 @@
 //= require turbolinks
 //= require cable
 //= require jquery-ui
-//= require bootstrap-datepicker
+//= require bootstrap-datepicker
+//= require bootstrap/modal