merge with august spring

2017-08-28 18:33:49 +06:30
parent 6472a2deac 63d97cce26
commit bbd9a50868
50 changed files with 1677 additions and 976 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,6 +21,7 @@
 //= require jquery-ui
 //= require bootstrap-datepicker
 //= require jquery.datetimepicker
+//= require dataTables/jquery.dataTables

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