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

2017-08-24 18:04:57 +06:30
parent 81f430b5c6 9327cb7169
commit 1f7ba42e80
25 changed files with 412 additions and 222 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,6 +20,7 @@
 //= require settings/processing_items
 //= require jquery-ui
 //= require bootstrap-datepicker
+//= require jquery.datetimepicker

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