fix conflit

2017-08-29 18:42:08 +06:30
parent f03d8654e7 e84c080552
commit 5fcfbdc020
16 changed files with 2965 additions and 15 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -25,6 +25,9 @@
 //= require moment
 //= require daterangepicker
 //= require select2
+//= require bootstrap-datetimepicker
+//= require pickers
+

 $(document).on('turbolinks:load', function() {
  $('.datepicker').datepicker({