merge crm

2017-06-08 15:29:37 +06:30
parent fbc00bc3e4 5768a0db6f
commit 5203a9f4a5
17 changed files with 584 additions and 84 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,3 +18,4 @@
 //= require cable
 //= require settings/processing_items
 //= require bootstrap-datepicker
+