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

2017-10-19 18:21:45 +06:30
parent 0809965edf 264318966e
commit 575d1b0638
3 changed files with 5 additions and 4 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,6 +16,7 @@
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_ujs
+//= require jquery-confirm
 //= require turbolinks
 //= require cable
 //= require settings/processing_items